Clean up the mess WRT rebuilding a limited set of files.

Earlier changes were based upon a wrong assumption (that CONFIG_FILES
could be relied upon).

diff --git a/acinclude.m4 b/acinclude.m4
index fb9bb01604175b290d4ab56fa83ba627d3594397..eab670e70dcc44294d05f83c9e40bd26b917ec7a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -308,12 +308,8 @@ AC_DEFUN(PHP_GEN_CONFIG_VARS,[
   done
 ])
 
-AC_DEFUN(PHP_GEN_MAKEFILE,[
-  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $1
-])
-
 AC_DEFUN(PHP_GEN_MAKEFILES,[
-  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $PHP_FAST_OUTPUT_FILES
+  $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $1
 ])
 
 AC_DEFUN(PHP_TM_GMTOFF,[
@@ -837,7 +833,7 @@ AC_DEFUN(AC_SOCKADDR_SA_LEN,[
 ])
 
 
-dnl ## PHP_AC_OUTPUT(file)
+dnl ## PHP_OUTPUT(file)
 dnl ## adds "file" to the list of files generated by AC_OUTPUT
 dnl ## This macro can be used several times.
 AC_DEFUN(PHP_OUTPUT,[

diff --git a/configure.in b/configure.in
index 7bcc7e92ce75a12a0e31bb32f5b816952d97ac62..e948a7047160fecd1410269c5fe50e942b2d9eec 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -795,20 +795,16 @@ PHP_CONFIGURE_PART(Generating files)
 PHP_GEN_CONFIG_VARS
 touch .deps
 
-#libphp4.module 
-AC_OUTPUT([php4.spec Zend/Makefile 
-           build-defs.h
-                  $PHP_OUTPUT_FILES
-                  ], [], [
-
-if test "$CONFIG_FILES" = ""; then
-    PHP_GEN_MAKEFILES
-else
-    for file in $PHP_FAST_OUTPUT_FILES; do
-               if test "\$file" = "\$CONFIG_FILES"; then
-                       PHP_GEN_MAKEFILE(\$file)
-               fi
-    done
+ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES"
+
+AC_OUTPUT($ALL_OUTPUT_FILES, [], [
+
+if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
+  REDO_ALL=yes
+fi
+
+if test -n "\$REDO_ALL"; then
+  PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES)
 fi
                   
 if test ! -f $srcdir/ext/bcmath/number.c; then
@@ -834,7 +830,7 @@ cat >Zend/zend_config.h <<FEO
 FEO
 
 # run this only when generating all the files?
-if test "\$CONFIG_FILES" = ""; then
+if test -n "\$REDO_ALL"; then
   # Hacking while airborne considered harmful.
   #
   echo "creating main/internal_functions.c"