diff options
author | Wez Furlong <wez@php.net> | 2003-12-05 03:14:54 +0000 |
---|---|---|
committer | Wez Furlong <wez@php.net> | 2003-12-05 03:14:54 +0000 |
commit | 1982ae6246f77cf262366384f668f7e7fbe1280d (patch) | |
tree | 9ff1f9a377c1be70308786bafef37ce195079016 /ext/iconv/config.w32 | |
parent | 24e54d43e6813cf109766c3a1c867e002162625e (diff) | |
download | php-git-1982ae6246f77cf262366384f668f7e7fbe1280d.tar.gz |
fix zts build
Diffstat (limited to 'ext/iconv/config.w32')
-rw-r--r-- | ext/iconv/config.w32 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 067707558a..c7e15e469a 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -3,13 +3,14 @@ ARG_WITH("iconv", "iconv support", "no"); -if (PHP_ICONV == "yes") { - EXTENSION("iconv", "iconv.c"); - AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled"); - AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available"); - AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to use"); - AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not"); - CHECK_LIB("iconv.lib", "iconv"); - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS"); +if (PHP_ICONV != "no") { + if (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"); + AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available"); + AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to use"); + AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not"); + } } |