php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fix zlib detection and enable features available in 7.18.1

Browse Source
This commit is contained in:
Pierre Joye
2008-08-24 15:16:39 +00:00
parent 473019a9b5
commit bfced427f7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/curl/config.w32
View File

@@ -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]');