[Emacs-diffs] /srv/bzr/emacs/trunk r106594: Propagate configure flags to sub-configures.

[Paul Eggert]

------------------------------------------------------------
revno: 106594
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-03 12:19:03 -0800
message:
  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.
modified:
  ChangeLog
  Makefile.in
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-12-03 04:06:45 +0000
+++ b/ChangeLog 2011-12-03 20:19:03 +0000
@@ -1,5 +1,14 @@
 2011-12-03  Paul Eggert  <address@hidden>
 
+       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  <address@hidden>
+
        * .bzrignore: Add config.cache.
 
 2011-11-27  Jan Djärv  <address@hidden>

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-11-22 01:56:49 +0000
+++ b/Makefile.in       2011-12-03 20:19:03 +0000
@@ -66,6 +66,11 @@
 
 # ==================== Things `configure' Might Edit ====================
 
+MAINTAINER_MODE_FLAG = --disable-maintainer-mode
address@hidden@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
+cache_file = @cache_file@
+CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
+
 address@hidden@
 address@hidden@
 address@hidden@
@@ -404,7 +409,7 @@
        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 @@
        if [ -x ./config.status ]; then           \
            ./config.status;                      \
        else                                      \
-           ./configure --enable-maintainer-mode; \
+           ./configure $(CONFIGURE_FLAGS);       \
        fi
        $(MAKE) $(MFLAGS) info all
 

=== modified file 'configure.in'
--- a/configure.in      2011-11-30 16:23:05 +0000
+++ b/configure.in      2011-12-03 20:19:03 +0000
@@ -182,6 +182,9 @@
 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])