diff options
| author | Wez Furlong <wez@php.net> | 2003-12-05 20:17:47 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-05 20:17:47 +0000 |
| commit | 952e0db997caa3114bac77fcf5a012ad8c1c8796 (patch) | |
| tree | ebcb43d609439c604332aa1c8ea103d005e87de4 /ext | |
| parent | 29e47dc7e42ef5d333b26acf4277cd38e5c2848f (diff) | |
| download | php-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')
| -rw-r--r-- | ext/iconv/config.w32 | 5 | ||||
| -rw-r--r-- | ext/libxml/config.w32 | 11 | ||||
| -rw-r--r-- | ext/xsl/config.w32 | 4 | ||||
| -rw-r--r-- | ext/zlib/config.w32 | 2 |
4 files changed, 13 insertions, 9 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"); diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index c1809a4e88..de6e853e16 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -4,13 +4,16 @@ 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"); + } } } diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32 index f56d0f482f..e5ad29fc58 100644 --- a/ext/xsl/config.w32 +++ b/ext/xsl/config.w32 @@ -5,9 +5,9 @@ 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) { diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32 index 5159696fd1..72e0ac06ab 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -6,7 +6,7 @@ ARG_ENABLE("zlib", "ZLIB support", "yes"); 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); } |