Commit 6c269a38 authored by Paul Eggert's avatar Paul Eggert
Browse files

Propagate configure flags to sub-configures.

* Makefile.in (cache_file, ENABLE_MAINTAINER_MODE, CONFIGUREFLAGS):
New macros.
(config.status, bootstrap): Use them to propagate configure flags
to sub-configures.
* configure.in (cache_file): AC_SUBST this, for Makefile.in.
parent c052ead4
2011-12-03 Paul Eggert <eggert@cs.ucla.edu>
Propagate configure flags to sub-configures.
* Makefile.in (cache_file, ENABLE_MAINTAINER_MODE, CONFIGUREFLAGS):
New macros.
(config.status, bootstrap): Use them to propagate configure flags
to sub-configures.
* configure.in (cache_file): AC_SUBST this, for Makefile.in.
2011-12-03 Paul Eggert <eggert@cs.ucla.edu>
* .bzrignore: Add config.cache.
......
......@@ -66,6 +66,11 @@ CDPATH=
# ==================== Things `configure' Might Edit ====================
MAINTAINER_MODE_FLAG = --disable-maintainer-mode
@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
CC=@CC@
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
......@@ -404,7 +409,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
if [ -x ./config.status ]; then \
./config.status --recheck; \
else \
./configure; \
./configure $(CONFIGURE_FLAGS); \
fi
AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
......@@ -936,7 +941,7 @@ bootstrap: bootstrap-clean FRC
if [ -x ./config.status ]; then \
./config.status; \
else \
./configure --enable-maintainer-mode; \
./configure $(CONFIGURE_FLAGS); \
fi
$(MAKE) $(MFLAGS) info all
......
......@@ -182,6 +182,9 @@ OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
## Makefile.in needs the cache file name.
AC_SUBST(cache_file)
## This is an option because I do not know if all info/man support
## compressed files, nor how to test if they do so.
OPTION_DEFAULT_ON([compress-info],[don't compress the installed Info pages])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment