From b6f6c5cf2f85f27b277b891acf0a22c4a068bbbe Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 12 Jan 2007 00:01:20 +0000
Subject: Simpler check for GLib support

---
 acinclude.m4 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 0e212b76..4b5b9d0f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,12 +79,9 @@ AC_DEFUN([AC_PATH_DBUS], [
 ])
 
 AC_DEFUN([AC_PATH_GLIB], [
-	PKG_CHECK_MODULES(GLIB, dbus-glib-1 > 0.35, glib_found=yes, AC_MSG_RESULT(no))
+	PKG_CHECK_MODULES(GLIB, glib-2.0, glib_found=yes, AC_MSG_RESULT(no))
 	AC_SUBST(GLIB_CFLAGS)
 	AC_SUBST(GLIB_LIBS)
-
-	DBUS_BINDING_TOOL="dbus-binding-tool"
-	AC_SUBST(DBUS_BINDING_TOOL)
 ])
 
 AC_DEFUN([AC_PATH_OPENOBEX], [
@@ -94,7 +91,7 @@ AC_DEFUN([AC_PATH_OPENOBEX], [
 ])
 
 AC_DEFUN([AC_PATH_OPENSYNC], [
-	PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 osengine-1.0, opensync_found=yes, AC_MSG_RESULT(no))
+	PKG_CHECK_MODULES(OPENSYNC, glib-2.0 opensync-1.0 osengine-1.0, opensync_found=yes, AC_MSG_RESULT(no))
 	AC_SUBST(OPENSYNC_CFLAGS)
 	AC_SUBST(OPENSYNC_LIBS)
 ])
@@ -137,7 +134,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	debug_enable=no
 	pie_enable=no
 	expat_enable=${expat_found}
-	glib_enable=${glib_found}
+	glib_enable=no
 	obex_enable=${openobex_found}
 	sync_enable=${opensync_found}
 	fuse_enable=no
@@ -253,6 +250,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		LDFLAGS="$LDFLAGS -pie"
 	fi
 
+	if (test "${glib_enable}" = "yes" && test "${glib_found}" = "yes"); then
+		AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if you have GLib support.])
+	fi
+
 	AM_CONDITIONAL(EXPAT, test "${expat_enable}" = "yes" && test "${expat_found}" = "yes")
 	AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes")
 	AM_CONDITIONAL(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes")
-- 
cgit