[PHP4BETA] CVS update: php4

Date: Monday May 3, 1999 @ 15:59 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv12905 Modified Files: configure.in.in genif.pl Log Message: vpath patches (cool job Stig!) Index: php4/configure.in.in diff -u php4/configure.in.in:1.23 php4/configure.in.in:1.24 --- php4/configure.in.in:1.23 Mon May 3 07:11:20 1999 +++ php4/configure.in.in Mon May 3 15:59:55 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.23 1999/05/03 11:11:20 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.24 1999/05/03 19:59:55 zeev Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -865,9 +865,9 @@ PHP_OS=uname AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS") -AC_OUTPUT(Makefile build-defs.h libphp3.module +AC_OUTPUT(Makefile libphp3.module scripts/mkextlib regex/Makefile ext/Makefile - @@EXT_MAKEFILES@@, [ + @@EXT_MAKEFILES@@ build-defs.h, [ chmod +x scripts/mkextlib ], [ @@ -876,7 +876,7 @@ echo "creating internal_functions.c" extensions=\grep '^s.@EXT_SUBDIRS@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\ mv -f internal_functions.c internal_functions.c.old 2>/dev/null -perl genif.pl internal_functions.c.in \$extensions > internal_functions.c +perl $srcdir/genif.pl $srcdir/internal_functions.c.in \$srcdir \$extensions > internal_functions.c if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then echo "internal_functions.c is unchanged" mv internal_functions.c.old internal_functions.c Index: php4/genif.pl diff -u php4/genif.pl:1.1 php4/genif.pl:1.2 --- php4/genif.pl:1.1 Mon May 3 07:11:20 1999 +++ php4/genif.pl Mon May 3 15:59:55 1999 @@ -1,23 +1,24 @@ #!/usr/bin/perl $in_file = shift || die "Give .in file as first parameter"; +$srcdir = shift || die "Give source dir as second parameter"; @extensions = @ARGV; open(IN, $in_file) or die "Could not open .in file $in_file"; while (<IN>) { - if (/\@EXT_INCLUDE_CODE\@/) { - foreach $ext (@extensions) { - $hdr_file = "ext/$ext/php3_${ext}.h"; - if (-f $hdr_file) { - print "#include \"ext/${ext}/php3_${ext}.h\"\n"; - } + if (/\@EXT_INCLUDE_CODE\@/) { + foreach $ext (@extensions) { + $hdr_file = "ext/$ext/php3_${ext}.h"; + if (-f "$srcdir/$hdr_file") { + print "#include \"ext/${ext}/php3_${ext}.h\"\n"; + } + } + } elsif (/\@EXT_MODULE_PTRS\@/) { + foreach $ext (@extensions) { + print " phpext_${ext}_ptr,\n"; + } + } else { + print; } - } elsif (/\@EXT_MODULE_PTRS\@/) { - foreach $ext (@extensions) { - print " phpext_${ext}_ptr,\n"; - } - } else { - print; - } } close(IN); -- PHP 4 Beta