- 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 8b38e2c37b5f7b75504a99a3dbee23e25b4bf627..b78c54002108cf9e31b9f0c0c7df499c8ffd7da5 100644 (file)
--- 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";
        }
 }