[PATCH 10/21] Fix test for dbus when cross building

[John Darrington]

* configure.ac: Replace ad hoc test for dbus with one using PKG_CHECK_MODULES
---
 configure.ac |   26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4b89c19..5889603 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,35 +508,13 @@ PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
 AC_SUBST(HAVE_FONTCONFIG)
 
 dnl DBus support
-HAVE_DBUS=""
-DBUS_CFLAGS=""
-DBUS_LIBS=""
 AC_ARG_ENABLE([dbus], AC_HELP_STRING([--disable-dbus],
     [Do not use dbus to communicate with external services]))
 if test "$enable_dbus" != "no"; then
-        if test "x$PKGCONFIG" != x; then
-                AC_MSG_CHECKING(for dbus with pkg-config)
-                if $PKGCONFIG --exists dbus-1; then
-                        AC_MSG_RESULT(yes)
-                        DBUS_CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1`"
-                        DBUS_LIBS="`$PKGCONFIG --libs dbus-1`"
-                        HAVE_DBUS=-DHAVE_DBUS
-                else
-                        AC_MSG_RESULT(no)
-                fi
-        fi
-        if test -z "$HAVE_DBUS"; then
-                AC_CHECK_LIB([dbus], [dbus_message_iter_get_basic], [
-                  AC_CHECK_HEADER([dbus-1.0/dbus/dbus.h], [
-                    DBUS_LIBS="-ldbus-1 -lpthread -lrt"
-                    HAVE_DBUS="-DHAVE_DBUS"
-                  ])
-                ])
-        fi
+   PKG_CHECK_MODULES([DBUS], [dbus-1], 
+                               [HAVE_DBUS="-DHAVE_DBUS"],[true])
 fi
 AC_SUBST(HAVE_DBUS)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
 
 AC_CHECK_LIB(dl, dlopen)
 
-- 
1.7.10.4