From 613cb60f8f6a4f6fddcd1ab6e7d47da045d680da Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Tue, 5 Aug 2008 19:40:16 +0000 Subject: [PATCH] - MFH: fix zlib detection (shared/static) and add zlib_a support --- ext/curl/config.w32 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index de10e16b822..b8f41b42a42 100644 --- 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");