diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-24 15:16:39 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-24 15:16:39 +0000 |
| commit | bfced427f74535865e5593e0d2146fa048eba3bb (patch) | |
| tree | 95318ba89869378b07c015c3efca4105c2874e4d | |
| parent | 473019a9b57fa4e9cbfe0598fbeec5288484c816 (diff) | |
| download | php-git-bfced427f74535865e5593e0d2146fa048eba3bb.tar.gz | |
- fix zlib detection and enable features available in 7.18.1
| -rw-r--r-- | ext/curl/config.w32 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index b8f41b42a4..0a080de1b7 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -7,13 +7,16 @@ if (PHP_CURL != "no") { if (CHECK_LIB("libcurl.lib", "curl", PHP_CURL) && CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") && CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) && - CHECK_LIB("libeay32.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)) { + CHECK_LIB("libeay32.lib", "curl", PHP_CURL) + && CHECK_LIB("winmm.lib", "curl", PHP_CURL) + && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) + ) { 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'); + AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have curl_easy_strerror in cURL'); + AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have curl_multi_strerror in cURL'); + AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info in cURL'); ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB"); // TODO: check for curl_version_info // AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers [experimental]'); |