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.

3 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b7deb4e4dde..2d17eedd518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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.
 
 2011-11-27  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/Makefile.in b/Makefile.in
index c0d108877c1..3ba7c9baae7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
 
diff --git a/configure.in b/configure.in
index b7dfa8eb39e..20dbf2b509e 100644
--- a/configure.in
+++ b/configure.in
@@ -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])