Enable dbus when available, do not require a configure option.

2005-07-05  Marco Pesenti Gritti  <mpg@redhat.com>

        * configure.ac:

        Enable dbus when available, do not require a configure
        option.

diff --git a/ChangeLog b/ChangeLog
index 61ca9c9a3d3660217421ce9d66c23d3328578fe8..bf83f093de52f9505aa2c1fdf1c42cbb86086bb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-05  Marco Pesenti Gritti  <mpg@redhat.com>
+
+       * configure.ac:
+
+       Enable dbus when available, do not require a configure
+       option.
+
 2005-07-05  Christian Persch  <chpe@cvs.gnome.org>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index ac1828854028204db3dc206316b31da5bdb10819..a6ee3d737f3df4cb2209f1ecd19f443724450bdb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,18 +50,14 @@ PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED)
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
 
-AC_ARG_ENABLE([dbus],
-        AS_HELP_STRING([--enable-dbus],[Enable DBUS (default=no)]),
-        [enable_dbus=$enableval],
-        [enable_dbus=no])
+PKG_CHECK_EXISTS([dbus-glib-1 >= $DBUS_GLIB_REQUIRED], [enable_dbus=yes],
+                 [AC_MSG_WARN("DBUS support is disabled since dbus 0.33 or higher was not found")
+                 enable_dbus=no])
 
-AC_MSG_RESULT([$enable_dbus])
-
-DBUS_VERSION=
 if test "x$enable_dbus" = "xyes" ; then
+       PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
        AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled])
-        PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
 
        DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'`
        AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])