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.

7 files changed, 16 insertions, 17 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index cf0d6a87d7..59e651f6f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -321,6 +321,10 @@ fi
 
 AC_DEFUN(PHP_SUBST,[
   PHP_VAR_SUBST="$PHP_VAR_SUBST $1"
+])
+
+AC_DEFUN(PHP_SUBST_OLD,[
+  PHP_SUBST($1)
   AC_SUBST($1)
 ])
 
diff --git a/genif.sh b/build/genif.sh
index 9f9dcd6ada..96cf2b162b 100644
--- a/genif.sh
+++ b/build/genif.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: genif.sh,v 1.10 2000-12-20 16:29:07 sas Exp $
+# $Id: genif.sh,v 1.1 2000-12-20 17:21:37 sas Exp $
 # replacement for genif.pl
 
 infile="$1"
@@ -27,7 +27,7 @@ for ext in ${1+"$@"} ; do
 	header_list="$header_list ext/$ext/*.h"
 done
 
-includes=`$awk -f $srcdir/build/print_include.awk $header_list`
+includes=`$awk -f ./build/print_include.awk $header_list`
 
 cd $olddir
 
diff --git a/configure.in b/configure.in
index aefa87c7f9..dc688a43ce 100644
--- a/configure.in
+++ b/configure.in
@@ -579,11 +579,6 @@ if test "$PHP_PEAR" = "yes"; then
   PEAR_DIR=pear
 fi
 
-PHP_OUTPUT(pear/pear)
-PHP_OUTPUT(pear/phpize)
-PHP_OUTPUT(pear/php-config)
-PHP_OUTPUT(pear/PEAR.php)
-
 
 divert(5)
 
@@ -668,7 +663,6 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
 EXTRA_LIBS="$EXTRA_LIBS $LIBS"
 LDFLAGS=""
 LIBS=""
-PHP_OUTPUT(TSRM/Makefile)
 
 
 phplibdir="`pwd`/modules"
@@ -762,7 +756,7 @@ PHP_SUBST(SHARED_LIBTOOL)
 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_CONFIGURE_PART(Generating files)
 
 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 @@ if test -n "\$REDO_ALL"; then
   # 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
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 820a733ae3..b9c79df155 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -80,5 +80,5 @@ if test "$PHP_OCI8" != "no"; then
 
   PHP_SUBST(OCI8_SHARED_LIBADD)
   PHP_SUBST(OCI8_DIR)
-  PHP_SUBST(OCI8_VERSION)
+  PHP_SUBST_OLD(OCI8_VERSION)
 fi
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 5191b61bfa..36f6890bd1 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -470,6 +470,6 @@ if test -n "$ODBC_TYPE"; then
   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
diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index 6a251a8c73..7fed23f385 100644
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -156,5 +156,5 @@ if test "$PHP_ORACLE" != "no"; then
 
   PHP_SUBST(ORACLE_SHARED_LIBADD)
   PHP_SUBST(ORACLE_DIR)
-  PHP_SUBST(ORACLE_VERSION)
+  PHP_SUBST_OLD(ORACLE_VERSION)
 fi
diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4
index 85d4c37d91..ad427997d2 100644
--- a/sapi/cgi/config.m4
+++ b/sapi/cgi/config.m4
@@ -64,5 +64,5 @@ AC_ARG_WITH(fhttpd,
 ])
 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)