Separate creating config_vars.mk and generating Makefiles.

This change enables you to regenerate Makefiles by running config.status.

diff --git a/acinclude.m4 b/acinclude.m4
index 2be95613f1bca0af82f7af7f5d116764d512ebfd..57a339c59ef4463cb0da92b23f69562bc96517a6 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -262,13 +262,16 @@ AC_DEFUN(PHP_MKDIR_P_CHECK,[
   ])
 ])
 
-AC_DEFUN(PHP_FAST_GENERATE,[
+AC_DEFUN(PHP_GEN_CONFIG_VARS,[
   PHP_MKDIR_P_CHECK
   echo creating config_vars.mk
   > config_vars.mk
   for i in $PHP_VAR_SUBST; do
     eval echo "$i = \$$i" >> config_vars.mk
   done
+])
+
+AC_DEFUN(PHP_GEN_MAKEFILES,[
   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $PHP_FAST_OUTPUT_FILES
 ])
 

diff --git a/configure.in b/configure.in
index d0e1568ceec55d72747ee476f0068a55fa9dd111..00e2f956c016b3459257ae46a19024d8f74ad8f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -790,7 +790,7 @@ changequote([,])
 
 PHP_CONFIGURE_PART(Generating files)
 
-PHP_FAST_GENERATE
+PHP_GEN_CONFIG_VARS
 touch .deps
 
 #libphp4.module 
@@ -799,6 +799,8 @@ AC_OUTPUT([php4.spec Zend/Makefile
                   $PHP_OUTPUT_FILES
                   ], [], [
 
+PHP_GEN_MAKEFILES
+                  
 if test ! -f $srcdir/ext/bcmath/number.c; then
        echo "creating number.c"
        echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c