summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-14 23:38:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-14 23:38:05 +0000
commit6268f98f31944b5345cb80f8ae0d6ad4699230fc (patch)
treeb18d1f1a9b9d145c78799598f240692a824cb674
parente12de025a37c4b469bc93ef106377520c4bc8de3 (diff)
downloadk9copy-3.5.13.tar.gz
k9copy-3.5.13.zip
Fix up k9copy DBUS detection routines for multiarchv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1258940 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--k9devices/configure.in.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/k9devices/configure.in.in b/k9devices/configure.in.in
index 75aba8e..31b754a 100644
--- a/k9devices/configure.in.in
+++ b/k9devices/configure.in.in
@@ -63,10 +63,10 @@
dbus_lib=NOTFOUND
dbus=NOTFOUND
- search_incs="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/lib/armel-linux-gnu/dbus-1.0/include /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
+ search_incs="$kde_includes /usr/lib/*/dbus-1.0/include /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
- search_incs_arch_deps="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include"
+ search_incs_arch_deps="$kde_includes /usr/lib/*/dbus-1.0/include /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include"
AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
@@ -74,7 +74,7 @@
dbus_inc=FOUND
fi
- search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/i386-linux-gnu /lib/x86_64-linux-gnu /lib/armel-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/armel-linux-gnu"
+ search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/*/ /usr/lib/*/"
AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
if test -r $dbus_libdir/libdbus-1.so ; then