From: Pierre Joye <pajoye@php.net>
Date: Sun, 6 Jul 2008 16:58:51 +0000 (+0000)
Subject: - update lib detection and does not enable it when lib/headers are missing
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e32f6a14d58157475dcdc8ef207a7dca05f7999;p=php

- update lib detection and does not enable it when lib/headers are missing
---

diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index 8b38e2c37b..b78c540021 100644
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -4,8 +4,10 @@
 ARG_WITH("iconv", "iconv support", "yes");
 
 if (PHP_ICONV != "no") {
-	if (/*CHECK_LIB("iconv.lib", "iconv", PHP_ICONV) &&*/
-		   	CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) {
+	if ((CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) ||
+			CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) &&
+		CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) {
+
 		EXTENSION("iconv", "iconv.c");
 		
 		AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
@@ -16,6 +18,9 @@ if (PHP_ICONV != "no") {
 		if (!PHP_ICONV_SHARED) {
 			ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
 		}
+	} else {
+		WARNING("iconv support can't be enabled, libraries or headers are missing")
+		PHP_ICONV = "no";
 	}
 }