pajoye Wed Nov 19 09:28:54 2008 UTC Modified files: /php-src/ext/curl config.w32 Log: - new naming and allow libcurl static build - c/p error for zlib http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/curl/config.w32 diff -u php-src/ext/curl/config.w32:1.7 php-src/ext/curl/config.w32:1.8 --- php-src/ext/curl/config.w32:1.7 Tue Aug 5 19:39:51 2008 +++ php-src/ext/curl/config.w32 Wed Nov 19 09:28:54 2008 @@ -1,15 +1,15 @@ -// $Id: config.w32,v 1.7 2008/08/05 19:39:51 pajoye Exp $ +// $Id: config.w32,v 1.8 2008/11/19 09:28:54 pajoye Exp $ // vim:ft=javascript ARG_WITH("curl", "cURL support", "no"); if (PHP_CURL != "no") { - if (CHECK_LIB("libcurl.lib", "curl", PHP_CURL) && + 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", "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))) && + (((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"); AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php