From: Jan-E <github@ehrhardt.nl>
Date: Fri, 22 Jan 2016 12:26:26 +0000 (+0100)
Subject: Fix PHP7 config.w32
X-Git-Tag: RELEASE_3_0_1~4^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=refs%2Fpull%2F21%2Fhead;p=m6w6%2Fext-http

Fix PHP7 config.w32
---

diff --git a/config.w32 b/config.w32
index 4bd1f69..7b63664 100644
--- a/config.w32
+++ b/config.w32
@@ -45,17 +45,15 @@ function check_for_pecl_ext(ext, header)
 
 if (PHP_HTTP != "no") {
 
-	EXTENSION("http",
-		"src/php_http.c src/php_http_buffer.c src/php_http_client.c " +
-		"src/php_http_client_request.c src/php_http_client_response.c " +
-		"src/php_http_cookie.c src/php_http_curl.c src/php_http_client_curl.c " +
-		"src/php_http_encoding.c src/php_http_env.c src/php_http_env_request.c " +
-		"src/php_http_env_response.c src/php_http_etag.c src/php_http_exception.c src/php_http_filter.c src/php_http_header_parser.c " +
-		"src/php_http_header.c src/php_http_info.c src/php_http_message.c src/php_http_message_body.c src/php_http_message_parser.c " +
-		"src/php_http_misc.c src/php_http_negotiate.c src/php_http_object.c src/php_http_options.c src/php_http_params.c " +
-		"src/php_http_querystring.c src/php_http_url.c src/php_http_version.c",
-		null,
-		null);
+	var PHP_HTTP_SRC_ARRAY = glob(configure_module_dirname + "/src/*.c");
+	var PHP_HTTP_SOURCES="";
+	for (var i=0; i<PHP_HTTP_SRC_ARRAY.length; ++i) {
+		var basename = FSO.GetFileName(PHP_HTTP_SRC_ARRAY[i]);
+		PHP_HTTP_SOURCES = PHP_HTTP_SOURCES + " " + basename;
+	}
+	//EXTENSION("http");
+	ADD_SOURCES(configure_module_dirname + "/src", PHP_HTTP_SOURCES, "http");
+	EXTENSION("http", "src/php_http.c");
 	AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
 	AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions");
 
@@ -115,6 +113,8 @@ if (PHP_HTTP != "no") {
 		AC_DEFINE("PHP_HAVE_CURL_FORMGET", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
+ 		ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
 
 		if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
 			CHECK_LIB("libevent.lib", "http", PHP_HTTP) &&