From: Michael Wallner <mike@php.net>
Date: Fri, 22 Jan 2016 13:04:02 +0000 (+0100)
Subject: Merge pull request #2 from Jan-E/master
X-Git-Tag: release-2.0.1~10
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8ea73a559e5d63e768294d7cd1c4655923fd3e5a;hp=03f4695cba9086b8a21819da733f09bc44ddac0a;p=m6w6%2Fext-raphf

Merge pull request #2 from Jan-E/master

Fix PHP7 config.w32
---

diff --git a/config.w32 b/config.w32
index 939cc1b..7a09923 100644
--- a/config.w32
+++ b/config.w32
@@ -1,15 +1,24 @@
 ARG_ENABLE("raphf", "for raphf support", "no");
 
 if (PHP_RAPHF == "yes") {
-	var PHP_RAPHF_HEADERS=glob("src/*.h"), PHP_RAPHF_SOURCES=glob("src/*.c");
+	var PHP_RAPHF_HEADERS=glob(configure_module_dirname + "/src/*.h");
+	var PHP_RAPHF_SRC_ARRAY=glob(configure_module_dirname + "/src/*.c");
+	var PHP_RAPHF_SOURCES="";
+	for (var i=0; i<PHP_RAPHF_SRC_ARRAY.length; ++i) {
+		var basename = FSO.GetFileName(PHP_RAPHF_SRC_ARRAY[i]);
+		PHP_RAPHF_SOURCES = PHP_RAPHF_SOURCES + " " + basename;
+	}
 
-	EXTENSION("raphf", PHP_RAPHF_SOURCES);
-	PHP_INSTALL_HEADERS("ext/raphf", "php_propro.h");
+	//EXTENSION("raphf");
+	ADD_SOURCES(configure_module_dirname + "/src", PHP_RAPHF_SOURCES, "raphf");
+	EXTENSION("raphf", "src/php_raphf_api.c");
+	PHP_INSTALL_HEADERS(configure_module_dirname, "php_raphf.h");
 	for (var i=0; i<PHP_RAPHF_HEADERS.length; ++i) {
 		var basename = FSO.GetFileName(PHP_RAPHF_HEADERS[i]);
-		copy_and_subst(PHP_RAPHF_HEADERS[i], basename, []);
-		PHP_INSTALL_HEADERS("ext/raphf", basename);
+		copy_and_subst("src/" + basename, basename, []);
+		PHP_INSTALL_HEADERS(configure_module_dirname, basename);
 	}
+	ADD_FLAG("CFLAGS_RAPHF", "/I" + configure_module_dirname + " ");
 
 	AC_DEFINE("HAVE_RAPHF", 1);
 }