From: Pierre Joye <pajoye@php.net>
Date: Wed, 19 Nov 2008 09:28:54 +0000 (+0000)
Subject: - new naming and allow libcurl static build
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffb726203b9cfe79ba0e21f1e2a2e5e06ac26056;p=php

- new naming and allow libcurl static build
- c/p error for zlib
---

diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index d7ca9ff7fa..ab0169cca7 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -4,12 +4,12 @@
 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');