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/dom/config.w32 | |
| 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/dom/config.w32')
| -rw-r--r-- | ext/dom/config.w32 | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/ext/dom/config.w32 b/ext/dom/config.w32 index 382587ff6e..8fba39336a 100644 --- a/ext/dom/config.w32 +++ b/ext/dom/config.w32 @@ -3,20 +3,24 @@ ARG_WITH("dom", "DOM support", "yes"); -if (PHP_DOM == "yes" && PHP_LIBXML == "yes") { - EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ - domstringlist.c domexception.c namelist.c processinginstruction.c \ - cdatasection.c documentfragment.c domimplementation.c element.c \ - node.c string_extend.c characterdata.c documenttype.c \ - domimplementationlist.c entity.c nodelist.c text.c comment.c \ - domconfiguration.c domimplementationsource.c entityreference.c \ - notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ - domlocator.c namednodemap.c userdatahandler.c"); - AC_DEFINE("HAVE_DOM", 1, "DOM support"); - if (!PHP_DOM_SHARED) { - ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); - } - ADD_EXTENSION_DEP('dom', 'libxml'); -} +if (PHP_DOM == "yes") { + if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('dom', 'libxml')) { + EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \ + domstringlist.c domexception.c namelist.c processinginstruction.c \ + cdatasection.c documentfragment.c domimplementation.c element.c \ + node.c string_extend.c characterdata.c documenttype.c \ + domimplementationlist.c entity.c nodelist.c text.c comment.c \ + domconfiguration.c domimplementationsource.c entityreference.c \ + notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ + domlocator.c namednodemap.c userdatahandler.c"); + AC_DEFINE("HAVE_DOM", 1, "DOM support"); + if (!PHP_DOM_SHARED) { + ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); + } + } else { + WARNING("dom support can't be enabled, libxml is not enabled") + PHP_DOM = "no" + } +} |