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/libxml | |
| 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/libxml')
| -rw-r--r-- | ext/libxml/config.w32 | 11 |
1 files changed, 7 insertions, 4 deletions
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"); + } } } |