pajoye Sun Jan 25 16:22:47 2009 UTC
Modified files:
/php-src/ext/curl config.w32
Log:
- MFB:
- update check for libs
- add HAVE_CURL_EASY_STRERROR, HAVE_CURL_MULTI_STRERROR,
HAVE_CURL_VERSION_INFO
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.8 php-src/ext/curl/config.w32:1.9
--- php-src/ext/curl/config.w32:1.8 Wed Nov 19 09:28:54 2008
+++ php-src/ext/curl/config.w32 Sun Jan 25 16:22:44 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2008/11/19 09:28:54 pajoye Exp $
+// $Id: config.w32,v 1.9 2009/01/25 16:22:44 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -7,13 +7,18 @@
if (CHECK_LIB("libcurl_a.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", "curl",
PHP_CURL) || CHECK_LIB("zlib.lib", "curl", PHP_CURL))) ||
- (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl",
PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
- CHECK_LIB("winmm.lib", "curl", PHP_CURL)) {
- EXTENSION("curl", "interface.c multi.c streams.c");
+ CHECK_LIB("libeay32.lib", "curl", PHP_CURL)
+ && CHECK_LIB("winmm.lib", "curl", PHP_CURL)
+ && CHECK_LIB("wldap32.lib", "curl", PHP_CURL)
+ && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip",
PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip",
PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ ) {
+ 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
