X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=c37c61bd3cf0a7b1c4185a0c53365b8f67b08bbe;hp=fb5c7f71f2df1b77c6ece03f014e62804da966a9;hb=c17987e25b6558974e60d20c4c10be9fd5221094;hpb=60087ee5180c74e0dec2f480c32872b902c29571

diff --git a/config.w32 b/config.w32
index fb5c7f7..c37c61b 100644
--- a/config.w32
+++ b/config.w32
@@ -45,20 +45,15 @@ function check_for_pecl_ext(ext, header)
 
 if (PHP_HTTP != "no") {
 
-	var PHP_HTTP_HEADERS=glob(configure_module_dirname + "/src/*.h");
-	for (var i=0; i<PHP_HTTP_HEADERS.length; ++i) {
-		var basename = FSO.GetFileName(PHP_HTTP_HEADERS[i]);
-		copy_and_subst("src/" + basename, basename, []);
-	}
 	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]);
-		copy_and_subst("src/" + basename, basename, []);
 		PHP_HTTP_SOURCES = PHP_HTTP_SOURCES + " " + basename;
 	}
-	EXTENSION("http", PHP_HTTP_SOURCES);
-
+	//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");
 
@@ -70,6 +65,7 @@ if (PHP_HTTP != "no") {
 
 	if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) {
 		AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
+		AC_DEFINE('PHP_HTTP_HAVE_ZLIB', 1, "");
 		ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
 	} else {
 		WARNING("zlib encoding functions not enabled; libraries and headers not found");
@@ -79,6 +75,7 @@ if (PHP_HTTP != "no") {
 		var f;
 
 		if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) {
+			AC_DEFINE("PHP_HTTP_HAVE_EXT_HASH", 1, "");
 			ADD_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1');
 			ADD_EXTENSION_DEP("http", "hash", true);
 		}
@@ -89,9 +86,28 @@ if (PHP_HTTP != "no") {
 	}
 
 	if (PHP_ICONV != "no") {
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_ICONV", 1, "");
 		ADD_EXTENSION_DEP("http", "iconv", true);
 	}
 
+	if (PHP_INTL != "no") {
+		ADD_EXTENSION_DEP("http", "intl", true);
+		AC_DEFINE("HAVE_IDNA2008", 1, "");
+		AC_DEFINE("HAVE_UIDNA_IDNTOASCII", 1, "");
+		AC_DEFINE("HAVE_UIDNA_NAMETOASCII_UTF8", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_LIBICU", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_IDNA2003", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_IDNA2008", 1, "");
+		ADD_FLAG("LIBS_HTTP", "icuuc.lib icudt.lib icuin.lib icuio.lib");
+		/* Compat for ICU before 58.1.*/
+		if (CHECK_LIB("icule.lib", "http", PHP_HTTP)) {
+			ADD_FLAG("LIBS_HTTP", "icule.lib");
+		}
+		if (CHECK_LIB("iculx.lib", "http", PHP_HTTP)) {
+			ADD_FLAG("LIBS_HTTP", "iculx.lib");
+		}
+	}
+
 	if (PHP_CURL != "no") {
 		ADD_EXTENSION_DEP("http", "curl", true);
 	}
@@ -101,15 +117,23 @@ if (PHP_HTTP != "no") {
 	if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
 			CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") &&
 			CHECK_LIB(CURL_LIB, "http", PHP_HTTP) &&
-			CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
-			CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("wldap32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libssh2.lib;libssh2_a.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("nghttp2.lib;nghttp2_a.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("normaliz.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libssl.lib;ssleay32.lib", "http", PHP_HTTP) &&
+			CHECK_LIB("libcrypto.lib;libeay32.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&
-			CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) &&
 			ADD_EXTENSION_DEP("http", "propro", true) &&
 			ADD_EXTENSION_DEP("http", "raphf", true) &&
 			CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
-		AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library");
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL", 1, "Have CURL library");
 		AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_SSL", 1);
+		AC_DEFINE("PHP_HTTP_HAVE_LIBCURL_OPENSSL", 1);
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_PROPRO", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_EXT_RAPHF", 1, "");
+		AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_STRERROR", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_SHARE_STRERROR", 1, "");
 		AC_DEFINE("PHP_HAVE_CURL_EASY_STRERROR", 1, "");
@@ -118,15 +142,19 @@ 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");
-		if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
+ 		ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
+
+		if (CHECK_HEADER_ADD_INCLUDE("event.h", "CFLAGS_HTTP") &&
+			CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
 			CHECK_LIB("libevent.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("libevent_extras.lib", "http", PHP_HTTP)) {
 
-			AC_DEFINE("PHP_HTTP_HAVE_EVENT", 1);
-			AC_DEFINE("PHP_HTTP_HAVE_EVENT2", 1);
-			AC_DEFINE("PHP_HTTP_EVENT_VERSION", "2.0.21 or greater");
+			AC_DEFINE("PHP_HTTP_HAVE_LIBEVENT", 1);
+			AC_DEFINE("PHP_HTTP_HAVE_LIBEVENT2", 1);
+			AC_DEFINE("PHP_HTTP_LIBEVENT_VERSION", "2.0.21 or greater");
+		} else {
+			WARNING("http module: libevent not enabled; libraries or headers not found");
 		}
 	} else {
 		WARNING("curl convenience functions not enabled; libraries and headers not found");