config.w32: fix missing icule.lib and iculx.lib

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 89a487996248fc26ba807cd629b7e3c52831a3d7..e7f265db6beb95c3310fa10cfbbb1be426a4cf1f 100644 (file)
--- 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("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)) {