cvs: php4 / acinclude.m4 configure.in

sas Wed Jul 26 07:53:55 2000 EDT Modified files: /php4 acinclude.m4 configure.in Log: 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). Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.101 php4/acinclude.m4:1.102 --- php4/acinclude.m4:1.101 Tue Jul 25 03:57:57 2000 +++ php4/acinclude.m4 Wed Jul 26 07:53:54 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.101 2000/07/25 10:57:57 ssb Exp $ +dnl $Id: acinclude.m4,v 1.102 2000/07/26 14:53:54 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -308,12 +308,8 @@ 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 @@ ]) -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,[ Index: php4/configure.in diff -u php4/configure.in:1.164 php4/configure.in:1.165 --- php4/configure.in:1.164 Wed Jul 26 04:33:56 2000 +++ php4/configure.in Wed Jul 26 07:53:54 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.164 2000/07/26 11:33:56 joey Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.165 2000/07/26 14:53:54 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -795,20 +795,16 @@ 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 @@ 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"