Add a configure option to enable/diable DBus. Patch by Rémi Cardona.

2008-03-22  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:

	Add a configure option to enable/diable DBus. Patch by Rémi
	Cardona. Fixes bug 521797.

svn path=/trunk/; revision=2976

diff --git a/ChangeLog b/ChangeLog
index 57a15de3daa96c7f340bd76ff641e9519a6e04d0..6a677b80dac81964e30fb834af70a14346d1d95e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-22  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * configure.ac:
+
+       Add a configure option to enable/diable DBus. Patch by Rémi
+       Cardona. Fixes bug 521797.
+       
 2008-03-22  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/pdf/ev-poppler.cc: (pdf_document_file_exporter_do_page):

diff --git a/configure.ac b/configure.ac
index 4b0dddad4ee4284f57973336d113dd8554e5b63e..73c81968f99b5c793f040cc486fdea849809f5af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,25 +104,31 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
 dnl ========= Check for DBUS
-PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
+AC_ARG_ENABLE(dbus,
+       [AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
+       enable_dbus="$enableval",enable_dbus=yes)
+if test "x$enable_dbus" != "xno"; then
+       PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
        [enable_dbus=yes],[enable_dbus=no])
-AC_SUBST([DBUS_CFLAGS])
-AC_SUBST([DBUS_LIBS])
 
-if test "x$enable_dbus" = "xno"; then
-       AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
-fi
+       if test "x$enable_dbus" = "xno"; then
+          AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
+       fi         
 
-if test "x$enable_dbus" = "xyes" ; then
-        AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+       if test "x$enable_dbus" = "xyes" ; then
+               AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
 
-        if test x$DBUS_BINDING_TOOL = "xno" ; then
-               AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
-        fi                                            
+               if test x$DBUS_BINDING_TOOL = "xno" ; then
+                       AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
+               fi                                            
 
-        AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+               AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+       fi
 fi
 
+AC_SUBST([DBUS_CFLAGS])
+AC_SUBST([DBUS_LIBS])
+
 LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS"
 LIB_LIBS="$LIB_LIBS $GNOME_LIBS"
 AC_SUBST(LIB_CFLAGS)