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.

1 files changed, 7 insertions, 2 deletions

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