From: Pierre Joye <pajoye@php.net>
Date: Fri, 24 Apr 2009 09:25:14 +0000 (+0000)
Subject: - simplify and use PHP_CURL
X-Git-Tag: php-5.4.0alpha1~191^2~3872
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=129c98c983c62d1b8ccaa9067a755da7a98733ea;p=php

- simplify and use PHP_CURL
---

diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index de92bff7aa..930adcfd41 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -10,8 +10,8 @@ if (PHP_CURL != "no") {
 			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');