cvs: php4 / acinclude.m4 configure.in genif.sh /build genif.sh /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /sapi/cgi config.m4

sas Wed Dec 20 09:21:39 2000 EDT Added files: /php4/build genif.sh Removed files: /php4 genif.sh Modified files: /php4 acinclude.m4 configure.in /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracle config.m4 /php4/sapi/cgi config.m4 Log: Stop automatically passing vars to AC_SUBST through PHP_SUBST. There are some variables which are needed for Makefiles and files created by AC_OUTPUT; we use PHP_SUBST_OLD for those now. genif.sh was moved to an appropiate place. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.116 php4/acinclude.m4:1.117 --- php4/acinclude.m4:1.116 Thu Dec 14 09:29:38 2000 +++ php4/acinclude.m4 Wed Dec 20 09:21:35 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.116 2000/12/14 17:29:38 sas Exp $ +dnl $Id: acinclude.m4,v 1.117 2000/12/20 17:21:35 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -321,6 +321,10 @@ AC_DEFUN(PHP_SUBST,[ PHP_VAR_SUBST="$PHP_VAR_SUBST $1" +]) + +AC_DEFUN(PHP_SUBST_OLD,[ + PHP_SUBST($1) AC_SUBST($1) ]) Index: php4/configure.in diff -u php4/configure.in:1.202 php4/configure.in:1.203 --- php4/configure.in:1.202 Wed Dec 20 08:29:07 2000 +++ php4/configure.in Wed Dec 20 09:21:35 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.202 2000/12/20 16:29:07 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.203 2000/12/20 17:21:35 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -579,12 +579,7 @@ PEAR_DIR=pear fi -PHP_OUTPUT(pear/pear) -PHP_OUTPUT(pear/phpize) -PHP_OUTPUT(pear/php-config) -PHP_OUTPUT(pear/PEAR.php) - divert(5) PHP_CONFIGURE_PART(Configuring extensions) @@ -668,7 +663,6 @@ EXTRA_LIBS="$EXTRA_LIBS $LIBS" LDFLAGS="" LIBS="" -PHP_OUTPUT(TSRM/Makefile) phplibdir="pwd/modules" @@ -762,7 +756,7 @@ PHP_SUBST(TSRM_DIR) PHP_SUBST(TSRM_LIB) PHP_SUBST(WARNING_LEVEL) -PHP_SUBST(YACC) +PHP_SUBST_OLD(YACC) PHP_CONFIGURE_PART(Configuring libtool) @@ -824,7 +818,8 @@ PHP_GEN_CONFIG_VARS -ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h $PHP_OUTPUT_FILES" +ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h \ +pear/pear pear/phpize pear/php-config pear/PEAR.php TSRM/Makefile $PHP_OUTPUT_FILES" AC_OUTPUT($ALL_OUTPUT_FILES, [], [ @@ -863,9 +858,9 @@ # Hacking while airborne considered harmful. # echo "creating main/internal_functions.c" - extensions=\grep '^s.@EXT_STATIC@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\ + extensions="$EXT_STATIC" dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null - sh $srcdir/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c + sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c dnl if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then dnl echo "main/internal_functions.c is unchanged" dnl mv main/internal_functions.c.old main/internal_functions.c Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.23 php4/ext/oci8/config.m4:1.24 --- php4/ext/oci8/config.m4:1.23 Sat Oct 28 21:36:32 2000 +++ php4/ext/oci8/config.m4 Wed Dec 20 09:21:36 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.23 2000/10/29 04:36:32 sniper Exp $ +dnl $Id: config.m4,v 1.24 2000/12/20 17:21:36 sas Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -80,5 +80,5 @@ PHP_SUBST(OCI8_SHARED_LIBADD) PHP_SUBST(OCI8_DIR) - PHP_SUBST(OCI8_VERSION) + PHP_SUBST_OLD(OCI8_VERSION) fi Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.33 php4/ext/odbc/config.m4:1.34 --- php4/ext/odbc/config.m4:1.33 Sun Dec 17 03:17:50 2000 +++ php4/ext/odbc/config.m4 Wed Dec 20 09:21:36 2000 @@ -470,6 +470,6 @@ PHP_SUBST(ODBC_LIBDIR) PHP_SUBST(ODBC_LIBS) PHP_SUBST(ODBC_LFLAGS) - PHP_SUBST(ODBC_TYPE) + PHP_SUBST_OLD(ODBC_TYPE) PHP_EXTENSION(odbc, $shared) fi Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.17 php4/ext/oracle/config.m4:1.18 --- php4/ext/oracle/config.m4:1.17 Sat Oct 28 21:36:32 2000 +++ php4/ext/oracle/config.m4 Wed Dec 20 09:21:36 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2000/10/29 04:36:32 sniper Exp $ +dnl $Id: config.m4,v 1.18 2000/12/20 17:21:36 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -156,5 +156,5 @@ PHP_SUBST(ORACLE_SHARED_LIBADD) PHP_SUBST(ORACLE_DIR) - PHP_SUBST(ORACLE_VERSION) + PHP_SUBST_OLD(ORACLE_VERSION) fi Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.5 php4/sapi/cgi/config.m4:1.6 --- php4/sapi/cgi/config.m4:1.5 Tue Sep 26 03:58:42 2000 +++ php4/sapi/cgi/config.m4 Wed Dec 20 09:21:36 2000 @@ -64,5 +64,5 @@ ]) INCLUDES="$INCLUDES $FHTTPD_INCLUDE" dnl## AC_SUBST(FHTTPD_INCLUDE) -AC_SUBST(FHTTPD_LIB) -AC_SUBST(FHTTPD_TARGET) +PHP_SUBST(FHTTPD_LIB) +PHP_SUBST(FHTTPD_TARGET) Index: php4/build/genif.sh +++ php4/build/genif.sh #! /bin/sh # $Id: genif.sh,v 1.1 2000/12/20 17:21:37 sas Exp $ # replacement for genif.pl infile="$1" shift srcdir="$1" shift extra_module_ptrs="$1" shift awk="$1" shift if test "$infile" = "" -o "$srcdir" = ""; then echo "please supply infile and srcdir" exit 1 fi module_ptrs="$extra_module_ptrs" header_list="" olddir=pwd cd $srcdir for ext in ${1+"$@"} ; do module_ptrs=" phpext_${ext}_ptr,\\\n$module_ptrs" header_list="$header_list ext/$ext/*.h" done includes=$awk -f ./build/print_include.awk $header_list cd $olddir cat $infile | \ sed \ -e "s'@EXT_INCLUDE_CODE@'$includes'" \ -e "s'@EXT_MODULE_PTRS@'$module_ptrs'" \ -e 's/[\]n/\ /g'