From 1401cd52fc8f3693b28c94d6e1406286bbe3ddfd Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Mon, 3 May 1999 19:59:55 +0000
Subject: [PATCH] vpath patches (cool job Stig!)

---
 configure.in.in |  6 +++---
 genif.pl        | 27 ++++++++++++++-------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index c94509aaee..efba6f1b44 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -865,9 +865,9 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME")
 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 @@ chmod +x scripts/mkextlib
 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
diff --git a/genif.pl b/genif.pl
index cf15e2eb92..dbbfd80e65 100644
--- a/genif.pl
+++ b/genif.pl
@@ -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);
-- 
2.40.0