cvs: php-src /ext/iconv config.w32 /ext/libxml config.w32 /ext/xsl config.w32 /ext/zlib config.w32

wez Fri Dec 5 15:17:48 2003 EDT Modified files: /php-src/ext/iconv config.w32 /php-src/ext/libxml config.w32 /php-src/ext/xsl config.w32 /php-src/ext/zlib config.w32 Log: 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. Index: php-src/ext/iconv/config.w32 diff -u php-src/ext/iconv/config.w32:1.3 php-src/ext/iconv/config.w32:1.4 --- php-src/ext/iconv/config.w32:1.3 Thu Dec 4 22:14:54 2003 +++ php-src/ext/iconv/config.w32 Fri Dec 5 15:17:45 2003 @@ -1,10 +1,11 @@ -// $Id: config.w32,v 1.3 2003/12/05 03:14:54 wez Exp $ +// $Id: config.w32,v 1.4 2003/12/05 20:17:45 wez Exp $ // 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"); Index: php-src/ext/libxml/config.w32 diff -u php-src/ext/libxml/config.w32:1.4 php-src/ext/libxml/config.w32:1.5 --- php-src/ext/libxml/config.w32:1.4 Thu Dec 4 08:38:45 2003 +++ php-src/ext/libxml/config.w32 Fri Dec 5 15:17:46 2003 @@ -1,16 +1,19 @@ -// $Id: config.w32,v 1.4 2003/12/04 13:38:45 wez Exp $ +// $Id: config.w32,v 1.5 2003/12/05 20:17:46 wez Exp $ // vim:ft=javascript ARG_WITH("libxml", "LibXML support", "yes"); if (PHP_LIBXML == "yes") { - - if ((CHECK_LIB("libxml2_a.lib", "libxml") || CHECK_LIB("libxml2.lib", "libxml")) && - CHECK_LIB("iconv.lib", "libxml") && + if (CHECK_LIB("libxml2_a.lib;libxml2.lib", "libxml") && + CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") && CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { + EXTENSION("libxml", "libxml.c", false /* never shared */); AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); - ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED"); + ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED /D LIBXML_STATIC "); + if (!PHP_LIBXML_SHARED) { + ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); + } } } Index: php-src/ext/xsl/config.w32 diff -u php-src/ext/xsl/config.w32:1.3 php-src/ext/xsl/config.w32:1.4 --- php-src/ext/xsl/config.w32:1.3 Thu Dec 4 08:32:22 2003 +++ php-src/ext/xsl/config.w32 Fri Dec 5 15:17:47 2003 @@ -1,13 +1,13 @@ -// $Id: config.w32,v 1.3 2003/12/04 13:32:22 rrichards Exp $ +// $Id: config.w32,v 1.4 2003/12/05 20:17:47 wez Exp $ // vim: ft=javascript ARG_WITH("xsl", "xsl support", "no"); if (PHP_XSL != "no") { if (PHP_DOM == "yes" && PHP_LIBXML == "yes") { - if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && - CHECK_LIB("libxml2.lib", "xsl") && + if (CHECK_LIB("libxslt_a.lib;libxslt.lib", "xsl", PHP_XSL) && CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) { + EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED); AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled"); if (! PHP_XSL_SHARED) { Index: php-src/ext/zlib/config.w32 diff -u php-src/ext/zlib/config.w32:1.2 php-src/ext/zlib/config.w32:1.3 --- php-src/ext/zlib/config.w32:1.2 Tue Dec 2 21:47:44 2003 +++ php-src/ext/zlib/config.w32 Fri Dec 5 15:17:47 2003 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.2 2003/12/03 02:47:44 wez Exp $ +// $Id: config.w32,v 1.3 2003/12/05 20:17:47 wez Exp $ // vim:ft=javascript ARG_ENABLE("zlib", "ZLIB support", "yes"); @@ -6,7 +6,7 @@ if (PHP_ZLIB == "yes") { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c", null, "/D ZLIB_EXPORTS"); AC_DEFINE("HAVE_ZLIB", 1, "Tokenizer support"); - CHECK_LIB("zlib.lib", "zlib", "..\\zlib;" + php_usual_lib_suspects); + CHECK_LIB("zlib_a;zlib.lib", "zlib", "..\\zlib;" + php_usual_lib_suspects); CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects); }