From d119a5daa2214f0d3420b964f27542bed3096020 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 17 Jan 2007 23:26:05 +0000
Subject: Check for D-Bus GLib bindings if GLib was found

---
 acinclude.m4 | 22 ++++++++++++++++------
 configure.in |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 95705f92..9b65fca0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -71,19 +71,24 @@ AC_DEFUN([AC_PATH_BLUEZ], [
 	AC_SUBST(BLUEZ_LIBS)
 ])
 
+AC_DEFUN([AC_PATH_GLIB], [
+	PKG_CHECK_MODULES(GLIB, glib-2.0, glib_found=yes, glib_found=no)
+	AC_SUBST(GLIB_CFLAGS)
+	AC_SUBST(GLIB_LIBS)
+])
+
 AC_DEFUN([AC_PATH_DBUS], [
 	PKG_CHECK_MODULES(DBUS, dbus-1 > 0.35, dummy=yes, AC_MSG_ERROR(dbus > 0.35 is required))
 	PKG_CHECK_EXISTS(dbus-1 < 0.95, DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE")
+	if (test "${glib_found}" = "yes"); then
+		PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 > 0.70, dbus_glib_found=yes, dbus_glib_found=no)
+	else
+		dbus_glib_found=no
+	fi
 	AC_SUBST(DBUS_CFLAGS)
 	AC_SUBST(DBUS_LIBS)
 ])
 
-AC_DEFUN([AC_PATH_GLIB], [
-	PKG_CHECK_MODULES(GLIB, glib-2.0, glib_found=yes, glib_found=no)
-	AC_SUBST(GLIB_CFLAGS)
-	AC_SUBST(GLIB_LIBS)
-])
-
 AC_DEFUN([AC_PATH_OPENOBEX], [
 	PKG_CHECK_MODULES(OPENOBEX, openobex > 1.1, openobex_found=yes, openobex_found=no)
 	AC_SUBST(OPENOBEX_CFLAGS)
@@ -262,6 +267,11 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 
 	if (test "${glib_enable}" = "yes" && test "${glib_found}" = "yes"); then
 		AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if you have GLib support.])
+		if (test "${dbus_glib_found}" = "yes"); then
+			AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define to 1 if you have D-Bus GLib bindings.])
+			DBUS_CFLAGS="$DBUS_CFLAGS $DBUS_GLIB_CFLAGS"
+			DBUS_LIBS="$DBUS_GLIB_LIBS"
+		fi
 	fi
 
 	AM_CONDITIONAL(INOTIFY, test "${inotify_enable}" = "yes" && test "${inotify_found}" = "yes")
diff --git a/configure.in b/configure.in
index baf00ef5..f12428d7 100644
--- a/configure.in
+++ b/configure.in
@@ -25,8 +25,8 @@ AC_PROG_LIBTOOL
 AC_FUNC_PPOLL
 
 AC_PATH_BLUEZ
-AC_PATH_DBUS
 AC_PATH_GLIB
+AC_PATH_DBUS
 AC_PATH_OPENOBEX
 AC_PATH_OPENSYNC
 AC_PATH_ALSA
-- 
cgit