Use AM_CONDITIONAL unconditionally, fixes the build with DBUS disabled.

2005-07-05  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:

	Use AM_CONDITIONAL unconditionally, fixes the build with DBUS
	disabled.

diff --git a/ChangeLog b/ChangeLog
index 6ebc23a89b6492e2588860869ab1e565f502be35..61ca9c9a3d3660217421ce9d66c23d3328578fe8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-05  Christian Persch  <chpe@cvs.gnome.org>
+
+       * configure.ac:
+
+       Use AM_CONDITIONAL unconditionally, fixes the build with DBUS
+       disabled.
+
 2005-07-05  Carlos Garcia Campos  <carlosgc@gnome.org>
            Marco Pesenti Gritti  <mpg@redhat.com>
 

diff --git a/configure.ac b/configure.ac
index 70084aa479fa4550f1a77ef870ad871107942698..ac1828854028204db3dc206316b31da5bdb10819 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ AC_ARG_ENABLE([dbus],
 
 AC_MSG_RESULT([$enable_dbus])
 
+DBUS_VERSION=
 if test "x$enable_dbus" = "xyes" ; then
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
        AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled])
@@ -64,11 +65,11 @@ if test "x$enable_dbus" = "xyes" ; then
 
        DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'`
        AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
-       AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
 fi
 
 AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
 AM_CONDITIONAL([ENABLE_METADATA], [test "x$enable_dbus" = "xyes"])
+AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
 
 dnl Check for Nautilus property page build
 AC_ARG_ENABLE(nautilus,