Fix and document recently introduced configuration options.

[bpt/emacs.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 37c35ce..f0cf5d6 100644 (file)
--- 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