diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-06 16:59:13 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-06 16:59:13 +0000 |
| commit | 4ef36bc36456940f140ed25229464174af3e63e0 (patch) | |
| tree | 8324de59b4054dcafe6cf3aecf0eef396940721e /ext/iconv | |
| parent | c02eff3995d40d6a4378e739bd319eab8b87f4cc (diff) | |
| download | php-git-4ef36bc36456940f140ed25229464174af3e63e0.tar.gz | |
- MFH: update lib detection and does not enable it when lib/headers are missing
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/config.w32 | 9 |
1 files 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"; } } |