- MFH: fix zlib detection (shared/static) and add zlib_a support

diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index de10e16b82223815466a0c396755c4eb3f33c253..b8f41b42a425444f9e8e8c18a81a288742742b70 100644 (file)
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -8,9 +8,10 @@ if (PHP_CURL != "no") {
                        CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
                        CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) &&
                        CHECK_LIB("libeay32.lib", "curl", PHP_CURL) &&
-                       CHECK_LIB("zlib.lib", "curl", PHP_CURL) &&
+               (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD))) || 
+                       (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
                        CHECK_LIB("winmm.lib", "curl", PHP_CURL)) {
-               EXTENSION("curl", "interface.c multi.c streams.c");
+               EXTENSION("curl", "interface.c multi.c streams.c", true);
                AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
                AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
                ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");