Split generating Makefiles and creating config_vars.mk.

The Makefiles are now rebuilt, when you run config.status.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85512 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index b5c8359d90f0d568b9da66383e38ed8a30d17f89..bff59b5d94ea36d71dce679d17fa9552a86b4d14 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -49,9 +49,9 @@ AC_DEFUN(APACHE_MKDIR_P_CHECK,[
   ])
 ])
 
-dnl APACHE_FAST_GENERATE
-dnl Creates Makefiles and config_vars.mk
-AC_DEFUN(APACHE_FAST_GENERATE,[
+dnl APACHE_GEN_CONFIG_VARS
+dnl Creates config_vars.mk
+AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(abs_srcdir)
   APACHE_SUBST(bindir)
   APACHE_SUBST(cgidir)
@@ -82,6 +82,11 @@ AC_DEFUN(APACHE_FAST_GENERATE,[
   for i in $APACHE_VAR_SUBST; do
     eval echo "$i = \$$i" >> config_vars.mk
   done
+])
+
+dnl APACHE_GEN_MAKEFILES
+dnl Creates Makefiles
+AC_DEFUN(APACHE_GEN_MAKEFILES,[
   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $APACHE_FAST_OUTPUT_FILES
 ])
 

diff --git a/configure.in b/configure.in
index 445dfae559d279c9e55d809077651e71eb81d93e..7ca6019e430d32322f91f9f76b5000af768ea34f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -175,10 +175,10 @@ AC_ARG_WITH(program-name,
   progname="$withval" ], [
   progname="httpd"] )
 
-APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
-            modules/Makefile os/Makefile support/Makefile)
+APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)
+APACHE_FAST_OUTPUT(modules/Makefile os/Makefile support/Makefile)
 
-APACHE_FAST_GENERATE
+APACHE_GEN_CONFIG_VARS
 
 dnl There needs to be a .deps file in the top build directory.
 dnl All others are created dynamically by rules.mk.
@@ -216,6 +216,8 @@ AC_TYPE_RLIM_T
 perlbin=`$srcdir/helpers/PrintPath perl`
 AC_SUBST(perlbin)
 
-AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs)
+AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs,,[
+  APACHE_GEN_MAKEFILES
+])