5 files changed, 37 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index b44b0a95a90..994f3f4ff3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-08  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * configure.ac (--disable-features): Rename to --without-all.
+        (OPTION_DEFAULT_ON): Change to use with_features.
+        * INSTALL: Fix description.
+
 2012-08-07  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * configure.ac: New option --disable-features.
diff --git a/INSTALL b/INSTALL
index 37c35cec2ce..f0cf5d68db0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -319,19 +319,21 @@ systems which support that.
 
 Use --without-sound to disable sound support.
 
-Use --disable-features if you want to build a small executable with
-the minimal dependencies on external libraries, at the cost
-of disabling most of the features that are normally enabled by default.
-Using --disable-features is equivalent to: --without-sound --without-dbus
---without-libotf --without-selinux --without-xft --without-gsettings
---without-gnutls --without-rsvg --without-xml2 --without-gconf
---without-imagemagick --without-m17n-flt --without-jpeg --without-tiff
---without-gif --without-png --without-gpm.  Note that --disable-features
-leaves X support enabled, and using the GTK2 or GTK3 toolkit creates a lot
-of library dependencies.  So if you want to build a small executable with
-very basic X support, use --disable-features --with-x-toolkit=no.
-For the smallest possible executable without X, use --disable-features
---without-x.
+Use --without-all if you want to build a small executable with the minimal
+dependencies on external libraries, at the cost of disabling most of the
+features that are normally enabled by default.  Using --without-all is
+equivalent to --without-sound --without-dbus --without-libotf
+--without-selinux --without-xft --without-gsettings --without-gnutls
+--without-rsvg --without-xml2 --without-gconf --without-imagemagick
+--without-m17n-flt --without-jpeg --without-tiff --without-gif
+--without-png --without-gpm.  Note that --without-all leaves X support
+enabled, and using the GTK2 or GTK3 toolkit creates a lot of library
+dependencies.  So if you want to build a small executable with very basic
+X support, use --without-all --with-x-toolkit=no.  For the smallest possible
+executable without X, use --without-all --without-x.  If you want to build
+with just a few features enabled, you can combine --without-all with
+--with-FEATURE.  For example, you can use --without-all --with-dbus
+to build with DBus support and nothing more.
 
 Use --with-wide-int to implement Emacs values with the type 'long long',
 even on hosts where a narrower type would do.  With this option, on a
diff --git a/configure.ac b/configure.ac
index 3fbea8c80ea..51dd8a375ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,13 +48,13 @@ archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'
 gamedir='${localstatedir}/games/emacs'
 
-dnl Do not omit a lot of the nice features by default.
-AC_ARG_ENABLE(features,
-[AS_HELP_STRING([--disable-features],
+dnl Special option to disable the most of other options.
+AC_ARG_WITH(all,
+[AS_HELP_STRING([--without-all],
                 [omit almost all features and build
                 small executable with minimal dependencies])],
-  enable_features=$enableval,
-  enable_features=yes)
+  with_features=$withval,
+  with_features=yes)
 
 dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
 dnl Create a new --with option that defaults to being disabled.
@@ -80,7 +80,7 @@ dnl   non-alphanumeric characters with "_".
 dnl HELP-STRING is the help text for the option.
 AC_DEFUN([OPTION_DEFAULT_ON], [dnl
   AC_ARG_WITH([$1],[AS_HELP_STRING([--without-$1],[$2])],[],[dnl
-   m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=$enable_features])dnl
+   m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=$with_features])dnl
 ])dnl
 
 OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail])
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3d26c9a1351..40b1e086237 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-08  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * NEWS: Mention --without-all and --enable-link-time-optimization.
+
 2012-07-31  Jan Djärv  <jan.h.d@swipnet.se>
 
         * TODO (NS port): Add text about event loop.
diff --git a/etc/NEWS b/etc/NEWS
index e9408ff45e0..e802340608e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -23,6 +23,12 @@ so we will look at it and add it to the manual.
 
 * Installation Changes in Emacs 24.2
 
+** New configure option '--without-all' to disable additonal features.
+This disables most of the features that are normally enabled by default.
+
+** New configure option '--enable-link-time-optimization' to utilize
+an appropriate feature provided by GCC since version 4.5.0.
+
 ** New configure option '--enable-gcc-warnings', intended for developers.
 If building with GCC, this enables compile-time checks that warn about
 possibly-questionable C code.  On a recent GNU system there should be