X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=3cc4069d6649ed7bf4f15de5e69145f0c40f0ccc;hp=929faaacb3a713dacea0e8ba47e845b7c3ef4609;hb=4d376d38ec260d4fd467bb95b41451bf645d92e4;hpb=b2f41a29a8e35559157619218e8978d4780c2f46

diff --git a/config.w32 b/config.w32
index 929faaa..3cc4069 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") {
@@ -116,15 +123,14 @@ if (PHP_HTTP != "no") {
 			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("crypt32.lib;libeay32.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("zlib.lib;zlib_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_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, "");
@@ -137,7 +143,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)) {
@@ -145,6 +152,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");