Fix dbus-tqt and dbus-1 checks

This resolves Bug 942
(cherry picked from commit f3e58cb8bd)

libk3bdevice/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS= -I$(srcdir)/libk3bdevice -I$(srcdir) $(all_includes) $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
+AM_CPPFLAGS= -I$(srcdir)/libk3bdevice -I$(srcdir) $(all_includes) $(HAL_INCS) $(DBUSQT_CFLAGS)
 
 KDE_CXXFLAGS = $(ENABLE_PERMISSIVE_FLAG)
 

libk3bdevice/configure.in.in

@@ -120,87 +120,29 @@ if test "x$ac_cv_use_hal" = "xyes" ; then
   AC_SUBST(HAL_LIBS)
 
 
-########### Check for DBus
-
-  AC_MSG_CHECKING(for DBus)
-
-  dbus_inc=NOTFOUND
-  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 /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 /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
-    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
-    dbus_inc=FOUND
-  fi
-
-  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
-    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
-    dbus_lib=FOUND
-  fi
-
-  if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then
-    AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps  libraries $dbus_libdir)
-    dbus=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
-
-  AC_SUBST(DBUS_INCS)
-  AC_SUBST(DBUS_LIBS)
-
 ########### Check for DBus-TQt bindings
 
-  AC_MSG_CHECKING(for DBus-TQt bindings)
-
-  dbusqt_inc=NOTFOUND
-  dbusqt_lib=NOTFOUND
-  dbusqt=NOTFOUND
-
-  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
+  AC_MSG_CHECKING(for DBus with DBus-TQt bindings)
 
-  if test -r $dbusqt_incdir/dbus/connection.h ; then
-    DBUSQT_INCS="-I$dbusqt_incdir"
-    dbusqt_inc=FOUND
-  fi
+  DBUS_REQ=1.0.0
+  PKG_CHECK_MODULES(DBUSQT, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
+                    dbus=FOUND,dbus=no)
 
-  search_libs="$kde_libraries /usr/lib /usr/lib64 /usr/local/lib"
-  AC_FIND_FILE(libdbus-tqt-1.so, $search_libs, dbusqt_libdir)
+  AC_SUBST(DBUSQT_CFLAGS)
+  AC_SUBST(DBUSQT_LIBS)
 
-  if test -r $dbusqt_libdir/libdbus-tqt-1.so ; then
-    DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-tqt-1"
-    dbusqt_lib=FOUND
-  fi
 
-  if [test $dbusqt_inc = FOUND] && [test $dbusqt_lib = FOUND] ; then
-    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
-    dbusqt=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
+########### Check if media HAL backend sould be compiled
 
-  AC_SUBST(DBUSQT_INCS)
-  AC_SUBST(DBUSQT_LIBS)
 fi
 
-########### Check if media HAL backend sould be compiled
-
 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
+if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
   AC_DEFINE(HAVE_HAL, , [compile in HAL support])
   have_hal=yes
-  HAL_DBUS_LIBS="$HAL_LIBS $DBUS_LIBS $DBUSQT_LIBS"
+  HAL_DBUS_LIBS="$HAL_LIBS $DBUSQT_LIBS"
 fi
 
 AM_CONDITIONAL(include_HAL, [test x$have_hal = xyes])