X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=c37c61bd3cf0a7b1c4185a0c53365b8f67b08bbe;hp=74b852f5cb0a301d5ff440b68a0fbc3695256b54;hb=52b988066074880ed220f99b4e71be3249b32c85;hpb=e64c43d8cbc40ed3a6f5f06e76dd5b7959a80c0c

diff --git a/config.w32 b/config.w32
index 74b852f..c37c61b 100644
--- a/config.w32
+++ b/config.w32
@@ -98,7 +98,14 @@ if (PHP_HTTP != "no") {
 		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 icule.lib iculx.lib");
+		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") {
@@ -110,10 +117,13 @@ 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)) {
@@ -134,7 +144,8 @@ if (PHP_HTTP != "no") {
 		AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
  		ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
 
-		if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
+		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)) {
@@ -142,6 +153,8 @@ if (PHP_HTTP != "no") {
 			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");