diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-15 00:07:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-15 00:07:52 +0000 |
| commit | 3b978422a6bbfaca8725bf96e658dad31687db1f (patch) | |
| tree | b94c6af04223e620178781593a1092ae5e593461 | |
| parent | 435ca112dec7f61f6cb989a7988fec139506145c (diff) | |
| download | k3b-3b978422a6bbfaca8725bf96e658dad31687db1f.tar.gz k3b-3b978422a6bbfaca8725bf96e658dad31687db1f.zip | |
Reactivate k3b HAL
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1258941 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | libk3bdevice/configure.in.in | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in index 5cabeec..dcfbb3b 100644 --- a/libk3bdevice/configure.in.in +++ b/libk3bdevice/configure.in.in @@ -128,10 +128,10 @@ if test "x$ac_cv_use_hal" = "xyes" ; then dbus_lib=NOTFOUND dbus=NOTFOUND - search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" + search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /usr/include/*/dbus-1.0" AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) - search_incs_arch_deps="$kde_includes /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/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include /usr/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 @@ -139,7 +139,7 @@ if test "x$ac_cv_use_hal" = "xyes" ; then dbus_inc=FOUND fi - search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64" + 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 @@ -157,9 +157,9 @@ if test "x$ac_cv_use_hal" = "xyes" ; then AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_LIBS) -########### Check for DBus-Qt bindings +########### Check for DBus-TQt bindings - AC_MSG_CHECKING(for DBus-Qt bindings) + AC_MSG_CHECKING(for DBus-TQt bindings) dbusqt_inc=NOTFOUND dbusqt_lib=NOTFOUND @@ -169,20 +169,15 @@ if test "x$ac_cv_use_hal" = "xyes" ; then AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) if test -r $dbusqt_incdir/dbus/connection.h ; then - have_qt_patch=0 - grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ - > /dev/null 2>&1 && have_qt_patch=1 - if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" - dbusqt_inc=FOUND - fi + DBUSQT_INCS="-I$dbusqt_incdir" + dbusqt_inc=FOUND fi search_libs="$kde_libraries /usr/lib /usr/lib64 /usr/local/lib" - AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) + AC_FIND_FILE(libdbus-tqt-1.so, $search_libs, dbusqt_libdir) - if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" + if test -r $dbusqt_libdir/libdbus-tqt-1.so ; then + DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-tqt-1" dbusqt_lib=FOUND fi @@ -201,6 +196,7 @@ fi have_hal=no HAL_DBUS_LIBS="" +AC_MSG_RESULT(Found HAL storage version $hal_storage_version) if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then AC_DEFINE(HAVE_HAL, , [compile in HAL support]) have_hal=yes |