summaryrefslogtreecommitdiff
path: root/ext/iconv
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-12-05 20:17:47 +0000
committerWez Furlong <wez@php.net>2003-12-05 20:17:47 +0000
commit952e0db997caa3114bac77fcf5a012ad8c1c8796 (patch)
treeebcb43d609439c604332aa1c8ea103d005e87de4 /ext/iconv
parent29e47dc7e42ef5d333b26acf4277cd38e5c2848f (diff)
downloadphp-git-952e0db997caa3114bac77fcf5a012ad8c1c8796.tar.gz
Use Rob's static libxml+libiconv library; new build no longer
requires libxml2.dll or iconv.dll at runtime. Since we have iconv built in, enable iconv extension by default too.
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/config.w325
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32
index c7e15e469a..ee6213a753 100644
--- a/ext/iconv/config.w32
+++ b/ext/iconv/config.w32
@@ -1,10 +1,11 @@
// $Id$
// vim: ft=javascript
-ARG_WITH("iconv", "iconv support", "no");
+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("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");