dbus ChangeLog,1.790,1.791 configure.in,1.116,1.117

[David Zeuthen]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv29978

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-06-14  David Zeuthen  <davidz at redhat.com>

        * bus/bus.c (process_config_every_time): Drop existing conf-dir
        watches (if applicable) and add new watches

        * bus/main.c (signal_handler): Handle SIGIO if using D_NOTIFY
        (main): Setup SIGIO signal handler if using D_NOTIFY

        * bus/config-parser.h: Add prototype bus_config_parser_get_conf_dirs

        * bus/config-parser.c (struct BusConfigParser): Add conf_dirs list
        (merge_included): Also merge conf_dirs list
        (bus_config_parser_unref): Clear conf_dirs list
        (include_dir): Add directory to conf_dirs list
        (bus_config_parser_get_conf_dirs): New function

        * bus/dir-watch.[ch]: New files

        * bus/Makefile.am (BUS_SOURCES): Add dir-watch.[ch]

        * configure.in: Add checks for D_NOTIFY on Linux



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -d -r1.790 -r1.791
--- ChangeLog	14 Jun 2005 15:55:10 -0000	1.790
+++ ChangeLog	15 Jun 2005 02:31:38 -0000	1.791
@@ -1,3 +1,25 @@
+2005-06-14  David Zeuthen  <davidz at redhat.com>
+
+	* bus/bus.c (process_config_every_time): Drop existing conf-dir
+	watches (if applicable) and add new watches
+
+	* bus/main.c (signal_handler): Handle SIGIO if using D_NOTIFY
+	(main): Setup SIGIO signal handler if using D_NOTIFY
+
+	* bus/config-parser.h: Add prototype bus_config_parser_get_conf_dirs
+
+	* bus/config-parser.c (struct BusConfigParser): Add conf_dirs list
+	(merge_included): Also merge conf_dirs list
+	(bus_config_parser_unref): Clear conf_dirs list
+	(include_dir): Add directory to conf_dirs list
+	(bus_config_parser_get_conf_dirs): New function
+
+	* bus/dir-watch.[ch]: New files
+
+	* bus/Makefile.am (BUS_SOURCES): Add dir-watch.[ch]
+
+	* configure.in: Add checks for D_NOTIFY on Linux
+
 2005-06-14  Colin Walters  <walters at verbum.org>
 
 	* glib/dbus-binding-tool-glib.c:

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- configure.in	18 May 2005 15:44:50 -0000	1.116
+++ configure.in	15 Jun 2005 02:31:38 -0000	1.117
@@ -7,6 +7,8 @@
 
 AM_CONFIG_HEADER(config.h)
 
+AC_CANONICAL_TARGET
+
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
@@ -822,6 +824,22 @@
     SELINUX_LIBS=
 fi
 
+# dnotify checks
+if test x$target_os = xlinux-gnu; then
+	AC_ARG_ENABLE(dnotify,
+	[  --disable-dnotify         Disable using dnotify on Linux],
+	[case "${enableval}" in
+	  yes) dnotify=false ;;
+	  no)  dnotify=true ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-dnotify) ;;
+	esac],[dnotify=true])
+fi
+dnl check if dnotify backend is enabled
+if test x$dnotify = xtrue; then
+   AC_DEFINE(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX,1,[Use dnotify on Linux])
+fi
+
+
 #### Set up final flags
 DBUS_CLIENT_CFLAGS=
 DBUS_CLIENT_LIBS=