pajoye Sun Aug 24 15:16:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl config.w32
Log:
- fix zlib detection and enable features available in 7.18.1
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2.2.1&r2=1.3.4.1.2.2.2.2&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.3.4.1.2.2.2.1
php-src/ext/curl/config.w32:1.3.4.1.2.2.2.2
--- php-src/ext/curl/config.w32:1.3.4.1.2.2.2.1 Tue Aug 5 19:40:16 2008
+++ php-src/ext/curl/config.w32 Sun Aug 24 15:16:39 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2.2.1 2008/08/05 19:40:16 pajoye Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.2 2008/08/24 15:16:39 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -7,13 +7,16 @@
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]');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
