Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.137
diff -u -r1.137 configure.in
--- configure.in	20 Oct 2005 14:56:24 -0000	1.137
+++ configure.in	2 Nov 2005 14:06:29 -0000
@@ -64,6 +64,7 @@
 AC_ARG_ENABLE(mono_docs,        [  --enable-mono-docs    build mono docs],enable_mono_docs=$enableval,enable_mono_docs=no)
 AC_ARG_ENABLE(python,           [  --enable-python       build python bindings],enable_python=$enableval,enable_python=auto)
 AC_ARG_ENABLE(selinux,          [  --enable-selinux      build with SELinux support],enable_selinux=$enableval,enable_selinux=auto)
+AC_ARG_ENABLE(dnotify,          [  --enable-dnotify      build with dnotify support (linux only)],enable_dnotify=$enableval,enable_dnotify=auto)
 
 AC_ARG_WITH(xml,                [  --with-xml=[libxml/expat]           XML library to use])
 AC_ARG_WITH(init-scripts,       [  --with-init-scripts=[redhat]        Style of init scripts to install])
@@ -829,21 +830,21 @@
 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])
+if test x$enable_dnotify = xno ; then
+    have_dnotify=no;
+else
+    if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
+        have_dnotify=yes;	
+    else
+        have_dnotify=no;
+    fi
 fi
+
 dnl check if dnotify backend is enabled
-if test x$dnotify = xtrue; then
+if test x$have_dnotify = xyes; 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=
@@ -1421,6 +1422,7 @@
         Building GLib bindings:   ${have_glib}
         Building Python bindings: ${have_python}
         Building SELinux support: ${have_selinux}
+        Building dnotify support: ${have_dnotify}
 	Building Mono bindings:	  ${enable_mono}
 	Building Mono docs:	  ${enable_mono_docs}
         Building GTK+ tools:      ${have_gtk}