From: Pierre Joye <pajoye@php.net>
Date: Tue, 5 Aug 2008 19:39:51 +0000 (+0000)
Subject: - fix zlib detection (shared/static) and add zlib_a support
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~861
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dddb79a32ff3afc4ce7dc9e530052c32b565566;p=php

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

diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index de10e16b82..d7ca9ff7fa 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -8,7 +8,8 @@ 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");
 		AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');