[gnote] Fix configure failure with --disable-dbus (Closes #590560)



commit 762ed62168340e0f3afaeed196b84554a94f2b97
Author: Gilles Dartiguelongue <eva gentoo org>
Date:   Mon Aug 3 00:06:15 2009 +0200

    Fix configure failure with --disable-dbus (Closes #590560)
    
    AM_CONDITIONAL for HAVE_DBUS was badly placed resulting in configure
    getting confused.
    
    Signed-off-by: Hubert Figuiere <hub figuiere net>

 configure.ac |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d9cf17a..f06deab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,15 +166,17 @@ AC_LANG_POP
 #
 # Use DBus to export our remote control if available.
 #
-AC_ARG_ENABLE(dbus, 
-	      [  --enable-dbus[[=no/yes]]    compile with dbus support [[default: yes]]],
-	      ENABLE_DBUS="$enableval", ENABLE_DBUS="yes")
-if test "x$ENABLE_DBUS" != "xno"; then
-        PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
-              have_dbus="yes";AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
-           ], have_dbus="no")
-        AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
+AC_ARG_ENABLE(dbus,
+	AS_HELP_STRING([--enable-dbus],[compile with dbus support @<:@default: yes@:>@]),
+	[],[enable_dbus=yes])
+
+if test "$enable_dbus" != "no"; then
+	PKG_CHECK_MODULES(DBUS, dbus-c++-1 >= $DBUSCPP_VERSION, [
+		have_dbus="yes"
+		AC_DEFINE([ENABLE_DBUS], [1], [Define to 1 if DBus is enabled])
+	], have_dbus="no")
 fi
+AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
 
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]