diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-05 19:40:16 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-05 19:40:16 +0000 |
| commit | 613cb60f8f6a4f6fddcd1ab6e7d47da045d680da (patch) | |
| tree | 7e9b1ffc28f5c73caeb556213f04915da9f18f5d | |
| parent | 833f96a2b3516e131ad1136da8950be5b049c997 (diff) | |
| download | php-git-613cb60f8f6a4f6fddcd1ab6e7d47da045d680da.tar.gz | |
- MFH: fix zlib detection (shared/static) and add zlib_a support
| -rw-r--r-- | ext/curl/config.w32 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index de10e16b82..b8f41b42a4 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"); |