From: Michael Wallner <mike@php.net>
Date: Fri, 22 Jan 2016 13:04:10 +0000 (+0100)
Subject: Merge pull request #2 from Jan-E/v1.0.x
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-propro;a=commitdiff_plain;h=eb0a819dbb80450394f59128fddb1a76252504ca;hp=121f5ccf85ec2d1f4d03f76393d32e25974010c2

Merge pull request #2 from Jan-E/v1.0.x

Fix PHP5 config.w32
---

diff --git a/config.w32 b/config.w32
index ed086e8..a2727c3 100644
--- a/config.w32
+++ b/config.w32
@@ -2,14 +2,21 @@
 ARG_ENABLE("propro", "for propro support", "no");
 
 if (PHP_PROPRO == "yes") {
-	var PHP_PROPRO_HEADERS=glob("src/*.h"), PHP_PROPRO_SOURCES=glob("src/*.c");
+	var PHP_PROPRO_HEADERS=glob(configure_module_dirname + "/src/*.h");
+	var PHP_PROPRO_SRC_ARRAY=glob(configure_module_dirname + "/src/*.c");
+	var PHP_PROPRO_SOURCES="";
+	for (var i=0; i<PHP_PROPRO_SRC_ARRAY.length; ++i) {
+		var basename = FSO.GetFileName(PHP_PROPRO_SRC_ARRAY[i]);
+		copy_and_subst("src/" + basename, basename, []);
+		PHP_PROPRO_SOURCES = PHP_PROPRO_SOURCES + " " + basename;
+	}
 
 	EXTENSION("propro", PHP_PROPRO_SOURCES);
-	PHP_INSTALL_HEADERS("ext/propro", "php_propro.h");
+	PHP_INSTALL_HEADERS(configure_module_dirname, "php_propro.h");
 	for (var i=0; i<PHP_PROPRO_HEADERS.length; ++i) {
 		var basename = FSO.GetFileName(PHP_PROPRO_HEADERS[i]);
-		copy_and_subst(PHP_PROPRO_HEADERS[i], basename, []);
-		PHP_INSTALL_HEADERS("ext/propro", basename);
+		copy_and_subst("src/" + basename, basename, []);
+		PHP_INSTALL_HEADERS(configure_module_dirname, basename);
 	}
 
 	AC_DEFINE("HAVE_PROPRO", 1);