cvs: php-src(PHP_5_3) /ext/curl config.w32
| From: | Pierre-Alain Joye | Date: | Fri, 24 Apr 2009 09:25:25 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/curl config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57168@lists.php.net to get a copy of this message | ||
pajoye Fri Apr 24 09:25:25 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl config.w32
Log:
- simplify and use PHP_CURL
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2.2.5&r2=1.3.4.1.2.2.2.6&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.5 php-src/ext/curl/config.w32:1.3.4.1.2.2.2.6
--- php-src/ext/curl/config.w32:1.3.4.1.2.2.2.5 Thu Apr 23 08:46:37 2009
+++ php-src/ext/curl/config.w32 Fri Apr 24 09:25:25 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2.2.5 2009/04/23 08:46:37 pajoye Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.6 2009/04/24 09:25:25 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -10,8 +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",
"curl", PHP_ZIP) || CHECK_LIB("zlib.lib", "curl", PHP_ZIP))) ||
- (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_ZIP)) ||
(PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib",
"curl", PHP_CURL))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) ||
(PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
) {
EXTENSION("curl", "interface.c multi.c streams.c", true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');