[Emacs-diffs] /srv/bzr/emacs/trunk r109518: Fix and document recently introduced configuration options.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109518
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-08 20:17:15 +0400
message:
  Fix and document recently introduced configuration options.
  * configure.ac (--disable-features): Rename to --without-all.
  (OPTION_DEFAULT_ON): Change to use with_features.
  * INSTALL: Fix description.
  * etc/NEWS: Mention --without-all and --enable-link-time-optimization.
modified:
  ChangeLog
  INSTALL
  configure.ac
  etc/ChangeLog
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-07 04:16:47 +0000
+++ b/ChangeLog 2012-08-08 16:17:15 +0000
@@ -1,3 +1,9 @@
+2012-08-08  Dmitry Antipov  <address@hidden>
+
+       * configure.ac (--disable-features): Rename to --without-all.
+       (OPTION_DEFAULT_ON): Change to use with_features.
+       * INSTALL: Fix description.
+
 2012-08-07  Dmitry Antipov  <address@hidden>
 
        * configure.ac: New option --disable-features.

=== modified file 'INSTALL'
--- a/INSTALL   2012-08-07 06:56:08 +0000
+++ b/INSTALL   2012-08-08 16:17:15 +0000
@@ -319,19 +319,21 @@
 
 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

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-08 16:01:28 +0000
+++ b/configure.ac      2012-08-08 16:17:15 +0000
@@ -48,13 +48,13 @@
 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 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])

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-07-31 19:23:33 +0000
+++ b/etc/ChangeLog     2012-08-08 16:17:15 +0000
@@ -1,3 +1,7 @@
+2012-08-08  Dmitry Antipov  <address@hidden>
+
+       * NEWS: Mention --without-all and --enable-link-time-optimization.
+
 2012-07-31  Jan Djärv  <address@hidden>
 
        * TODO (NS port): Add text about event loop.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-08 07:19:58 +0000
+++ b/etc/NEWS  2012-08-08 16:17:15 +0000
@@ -23,6 +23,12 @@
 
 * 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