--without-all should imply --with-file-notification=no.

* configure.ac (with_file_notification): Default to $with_features.

Fixes: debbugs:14569

diff --git a/ChangeLog b/ChangeLog
index c79c28e77c3645e9aebeaa33d5b013c173a24332..bad19f32a91cc8bb9c4ad3280b6c169fc7ad6afb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       --without-all should imply --with-file-notification=no.  (Bug#14569)
+       * configure.ac (with_file_notification): Default to $with_features.
+
 2013-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/configure.ac b/configure.ac
index 9c51d2113a5058a45a4996d03b51cdc4ba5ab5ed..656255c0e9aaa83801963848d934c133e67152bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -216,7 +216,7 @@ this option's value should be `yes', `no', `gfile', `inotify' or `w32'.
    esac
    with_file_notification=$val
  ],
- [with_file_notification=yes])
+ [with_file_notification=$with_features])
 
 ## For the times when you want to build Emacs but don't have
 ## a suitable makeinfo, and can live without the manuals.