# Make dbus support configurable
# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=578777
# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=265828
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac	2009-03-22 05:42:31.000000000 +0530
+++ b/configure.ac	2009-04-12 16:27:06.816454299 +0530
@@ -76,16 +76,24 @@
                           glib-2.0 >= $GLIB_REQUIRED dnl
                           gtk+-2.0 >= $GTK_REQUIRED)
 
-dnl D-Bus backend dependencies
-if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then
-  have_dbus=yes
-  PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-  AC_SUBST(DBUS_CFLAGS)
-  AC_SUBST(DBUS_LIBS)
-  AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) 
-  AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
-else
-  have_dbus=no
+AC_ARG_ENABLE([dbus],
+	[AC_HELP_STRING([--enable-dbus],
+	[Enable with D-Bus support @<:@default=yes@:>@])],
+	[have_dbus=$enableval],
+	[have_dbus=yes])
+
+if test x$have_dbus = xyes; then
+  dnl D-Bus backend dependencies
+  if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then
+    have_dbus=yes
+    PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
+    AC_SUBST(DBUS_CFLAGS)
+    AC_SUBST(DBUS_LIBS)
+    AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) 
+    AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
+  else
+    have_dbus=no
+  fi
 fi
 
 AM_CONDITIONAL([HAVE_DBUS], [test x$have_dbus = xyes])
@@ -171,7 +179,8 @@
 
 echo "
 Configuration:
-            Maintainer flags: $enable_maintainer_flags
-                 Debug level: $enable_debug
-         Build documentation: $enable_gtk_doc
+	Maintainer flags:	$enable_maintainer_flags
+	Debug level: 		$enable_debug
+	Build documentation: 	$enable_gtk_doc
+	D-Bus support:		$have_dbus
 "