A lib/ephy-dbus.c: A lib/ephy-dbus.h:

2005-01-10  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* lib/Makefile.am:
	A lib/ephy-dbus.c:
	A lib/ephy-dbus.h:
	* lib/ephy-marshal.list:
	* src/Makefile.am:
	* src/ephy-shell.c: (ephy_shell_finalize),
	(ephy_shell_get_dbus_service):
	* src/ephy-shell.h:

	Add experimental dbus service, disabled by default. Configure with
	--enable-dbus to enable.

1 files changed, 26 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index a68f3e98b..61ca3b769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -471,7 +471,7 @@ fi
 
 AC_MSG_CHECKING([whether to enable native gtk+ filepicker])
 AC_ARG_ENABLE([filepicker],
-	AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not neede when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
+	AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not needed when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
 	[filepicker=$enableval],
 	[filepicker=yes])
 AC_MSG_RESULT([$filepicker])
@@ -487,6 +487,31 @@ dnl ***************
 
 AC_CHECK_HEADERS([X11/XF86keysym.h])
 
+dnl ***********************************
+dnl Check for DBUS and DBUS net monitor
+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=no])
+
+DBUS_REQUIRED=0.22
+DBUS_GLIB_REQUIRED=0.22
+
+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])
+fi
+
+AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
+
+AC_MSG_RESULT([$enable_dbus])
+
 dnl *******************************
 dnl Add warning flags
 dnl *******************************