From: Pierre Joye <pajoye@php.net>
Date: Sun, 25 Jan 2009 16:22:44 +0000 (+0000)
Subject: - MFB:
X-Git-Tag: php-5.4.0alpha1~191^2~4393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deb0695069ef72d7a0936fdabaa7c9fea02f7fcd;p=php

- MFB:
 - update check for libs
 - add HAVE_CURL_EASY_STRERROR, HAVE_CURL_MULTI_STRERROR, HAVE_CURL_VERSION_INFO
---

diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index ab0169cca7..33e5ad75f2 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -7,13 +7,18 @@ if (PHP_CURL != "no") {
 	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", "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");
+			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');
 		AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+		AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have curl_easy_strerror in cURL');
+		AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have curl_multi_strerror in cURL');
+		AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info in cURL');
 		ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
 		// TODO: check for curl_version_info
 		// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers [experimental]');