diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | INSTALL | 17 | ||||
| -rw-r--r-- | configure.ac | 21 |
3 files changed, 27 insertions, 17 deletions
@@ -1,3 +1,9 @@ +2014-06-05 Paul Eggert <eggert@cs.ucla.edu> + + * configure.ac: --without-all now implies --without-xft, --disable-acl. + * INSTALL: Remove apparently unmaintained documentation about what + --without-all exactly means. + 2014-06-03 Eli Zaretskii <eliz@gnu.org> * configure.ac (C_HEAP_SWITCH): Remove. @@ -304,22 +304,17 @@ systems which support that. Use --without-sound to disable sound support. -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 --without-file-notification. Note that ---without-all leaves X support enabled, and using the GTK2 or GTK3 +Use --without-all for a smaller executable with fewer dependencies on +external libraries, at the cost of disabling many features. Although +--without-all disables libraries not needed for ordinary Emacs +operation, it does enable X support, 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. +For example, you can use --without-all --without-x --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 967d2c4470..fbfedb0279 100644 --- a/configure.ac +++ b/configure.ac @@ -2817,14 +2817,17 @@ fi ### Start of font-backend (under X11) section. if test "${HAVE_X11}" = "yes"; then - EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0], - [HAVE_FC=yes], [HAVE_FC=no]) - - ## Use -lXft if available, unless `--with-xft=no'. - HAVE_XFT=maybe - if test "${HAVE_FC}" = "no" || test "x${with_x}" = "xno"; then + ## Use -lXft if available, unless `--with-xft=no'. + HAVE_XFT=maybe + if test "x${with_x}" = "xno"; then with_xft="no"; fi + + if test "$with_xft" != no; then + EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0]) + with_xft=$HAVE_FONTCONFIG + fi + if test "x${with_xft}" != "xno"; then EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no]) @@ -4751,6 +4754,12 @@ AH_VERBATIM([FORTIFY_SOUR], #endif ]) +# If user asks to omit features, disable optional features that gnulib +# might otherwise enable. +if test "$with_features" = no && test "$enable_acl" != yes; then + enable_acl=no +fi + # Configure gnulib. Although this does not affect CFLAGS or LIBS permanently. # it temporarily reverts them to their pre-pkg-config values, # because gnulib needs to work with both src (which uses the |