add Pierre's config.w32 fixes to R_1_6

diff --git a/config.w32 b/config.w32
index d515e5c5209e877b20a3dca12b4537ba7a3b6e7f..680d7fa24eb745306c41ced159e5cfdb68df95c0 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -95,13 +95,13 @@ if (PHP_HTTP != "no") {
                ADD_EXTENSION_DEP("http", "iconv", true);
        }
        
-       CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
+       CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib");
        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("zlib.lib", "http", PHP_HTTP) &&
+                       CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
                AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
                AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");