diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-05 19:39:51 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-05 19:39:51 +0000 |
| commit | 1dddb79a32ff3afc4ce7dc9e530052c32b565566 (patch) | |
| tree | 7140c26e0574323dea289be1b763759a1b7251a6 | |
| parent | 7772d56fabec67316f15e02b5fdc61c5cb8508f4 (diff) | |
| download | php-git-1dddb79a32ff3afc4ce7dc9e530052c32b565566.tar.gz | |
- fix zlib detection (shared/static) and add zlib_a support
| -rw-r--r-- | ext/curl/config.w32 | 3 |
1 files changed, 2 insertions, 1 deletions
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'); |