aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-01-10 08:11:34 +0800
committerChristian Persch <chpe@src.gnome.org>2005-01-10 08:11:34 +0800
commitdb1d9c156dce000c86c7ea961ac55c9a46b48e8e (patch)
tree6f7ce9cbc78bb64f17e9cceb7c28d33af8ad5140
parentc841a4c82601d795e75dfec0007eb9e0e3580f53 (diff)
downloadgsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar.gz
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar.bz2
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar.lz
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar.xz
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.tar.zst
gsoc2013-epiphany-db1d9c156dce000c86c7ea961ac55c9a46b48e8e.zip
Fix dbus configure check to really default to off.
2005-01-10 Christian Persch <chpe@cvs.gnome.org> * configure.ac: Fix dbus configure check to really default to off.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac14
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c7807bf67..24f541e0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2005-01-10 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
+
+ Fix dbus configure check to really default to off.
+
+2005-01-10 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
* lib/Makefile.am:
A lib/ephy-dbus.c:
A lib/ephy-dbus.h:
diff --git a/configure.ac b/configure.ac
index 61ca3b769..931e87ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,22 +487,24 @@ dnl ***************
AC_CHECK_HEADERS([X11/XF86keysym.h])
-dnl ***********************************
-dnl Check for DBUS and DBUS net monitor
-dnl ***********************************
+dnl ****
+dnl DBUS
+dnl ****
AC_MSG_CHECKING([whether DBUS support is requested])
enable_dbus=no
AC_ARG_ENABLE([dbus],
AS_HELP_STRING([--enable-dbus],[Enable DBUS (default=no)]),
- [enable_dbus=yes],
+ [enable_dbus=$enableval],
[enable_dbus=no])
+AC_MSG_RESULT([$enable_dbus])
+
DBUS_REQUIRED=0.22
DBUS_GLIB_REQUIRED=0.22
-if test x"$enable_dbus" = "xyes" ; then
+if test "x$enable_dbus" = "xyes" ; then
AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled (default=disabled)])
PKG_CHECK_MODULES([DBUS], [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
@@ -510,8 +512,6 @@ fi
AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AC_MSG_RESULT([$enable_dbus])
-
dnl *******************************
dnl Add warning flags
dnl *******************************