diff options
| author | Wez Furlong <wez@php.net> | 2003-12-04 13:38:47 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-04 13:38:47 +0000 |
| commit | a5cf8362603d1f0a40ce1e0ccbf326a28e741777 (patch) | |
| tree | 9d13652caf852833c80ea01f60d5f9f1704868f7 /ext | |
| parent | bcbc036ac1989e646a3281b7a5843eb21ac8b42c (diff) | |
| download | php-git-a5cf8362603d1f0a40ce1e0ccbf326a28e741777.tar.gz | |
Fix libxml to use static lib if found.
Disable apache and isapi by default.
Add some smarts so that we can really build extensions and SAPI found in php-src/pecl and/or php-src/../pecl.
Only include a logo in the resources if we are building an .exe.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libxml/config.w32 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index cd296dd7a3..c1809a4e88 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -4,13 +4,14 @@ ARG_WITH("libxml", "LibXML support", "yes"); if (PHP_LIBXML == "yes") { - EXTENSION("libxml", "libxml.c", false /* never shared */); - AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); - CHECK_LIB("iconv.lib", "libxml"); - CHECK_LIB("libxml2.lib", "libxml"); - CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS"); - ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED"); + if ((CHECK_LIB("libxml2_a.lib", "libxml") || CHECK_LIB("libxml2.lib", "libxml")) && + CHECK_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"); + } } |