From 1e32f6a14d58157475dcdc8ef207a7dca05f7999 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Sun, 6 Jul 2008 16:58:51 +0000 Subject: [PATCH] - update lib detection and does not enable it when lib/headers are missing --- ext/iconv/config.w32 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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"; } } -- 2.40.0