pajoye Tue Aug 5 19:40:16 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl config.w32
Log:
- MFH: fix zlib detection (shared/static) and add zlib_a support
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2&r2=1.3.4.1.2.2.2.1&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.3.4.1.2.2
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 Tue Nov 14 19:57:13 2006
+++ php-src/ext/curl/config.w32 Tue Aug 5 19:40:16 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2 2006/11/14 19:57:13 edink Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.1 2008/08/05 19:40:16 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -8,9 +8,10 @@
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");
+ 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');
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
