pajoye Sun Jan 25 16:21:05 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl config.w32 Log: - check for zlib too http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2.2.3&r2=1.3.4.1.2.2.2.4&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.3 php-src/ext/curl/config.w32:1.3.4.1.2.2.2.4 --- php-src/ext/curl/config.w32:1.3.4.1.2.2.2.3 Wed Nov 19 09:28:13 2008 +++ php-src/ext/curl/config.w32 Sun Jan 25 16:21:03 2009 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.3.4.1.2.2.2.3 2008/11/19 09:28:13 pajoye Exp $ +// $Id: config.w32,v 1.3.4.1.2.2.2.4 2009/01/25 16:21:03 pajoye Exp $ // vim:ft=javascript ARG_WITH("curl", "cURL support", "no"); @@ -10,6 +10,8 @@ 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');
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php