diff options
| author | Pierre Joye <pajoye@php.net> | 2008-06-23 18:40:29 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-06-23 18:40:29 +0000 |
| commit | 41976c7ab67b6624cd661eae7c8ae0565874d465 (patch) | |
| tree | 091b13cb5be71b4c1ea3760aab2d7c8add656ca0 /ext/libxml | |
| parent | 019c5861910b6c1d5669472d3202c5d5b2161993 (diff) | |
| download | php-git-41976c7ab67b6624cd661eae7c8ae0565874d465.tar.gz | |
- do not enable an ext when a lib/header fails
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
Diffstat (limited to 'ext/libxml')
| -rw-r--r-- | ext/libxml/config.w32 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index 5ba19a3e7b..331e6de98e 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -6,7 +6,8 @@ ARG_WITH("libxml", "LibXML support", "yes"); if (PHP_LIBXML == "yes") { if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") && CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml") && - CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) { + CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML") && + ADD_EXTENSION_DEP('libxml', 'iconv')) { EXTENSION("libxml", "libxml.c", false /* never shared */); AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); @@ -14,11 +15,8 @@ if (PHP_LIBXML == "yes") { if (!PHP_LIBXML_SHARED) { ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); } - ADD_EXTENSION_DEP('libxml', 'iconv'); } else { WARNING("libxml support can't be enabled, iconv or libxml are missing") PHP_LIBXML = "no" } } - - |