aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-06-11 11:05:05 -0700
committerPaul Eggert2013-06-11 11:05:05 -0700
commitb0e228313455c1d9ee6e9cf9360aefa4a382c330 (patch)
treec0508bed2d9765492cbe704876e2d0ab35fe3133
parent7de135d06fcc24d3ee946947251a8b969fb3fee0 (diff)
downloademacs-b0e228313455c1d9ee6e9cf9360aefa4a382c330.tar.gz
emacs-b0e228313455c1d9ee6e9cf9360aefa4a382c330.zip
--without-all should imply --with-file-notification=no.
* configure.ac (with_file_notification): Default to $with_features. Fixes: debbugs:14569
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c79c28e77c3..bad19f32a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-06-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 --without-all should imply --with-file-notification=no. (Bug#14569)
4 * configure.ac (with_file_notification): Default to $with_features.
5
12013-06-09 Paul Eggert <eggert@cs.ucla.edu> 62013-06-09 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Merge from gnulib, incorporating: 8 Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index 9c51d2113a5..656255c0e9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,7 +216,7 @@ this option's value should be `yes', `no', `gfile', `inotify' or `w32'.
216 esac 216 esac
217 with_file_notification=$val 217 with_file_notification=$val
218 ], 218 ],
219 [with_file_notification=yes]) 219 [with_file_notification=$with_features])
220 220
221## For the times when you want to build Emacs but don't have 221## For the times when you want to build Emacs but don't have
222## a suitable makeinfo, and can live without the manuals. 222## a suitable makeinfo, and can live without the manuals.