diff options
| author | Marcus Boerger <helly@php.net> | 2003-06-14 11:27:49 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-06-14 11:27:49 +0000 |
| commit | 4a97e3fef67cda8aad4c8fa7ec68e27e58d04b4d (patch) | |
| tree | b382d660d38389c90f67abb27b81fa5f666abfa2 | |
| parent | 68ff4becab9b67b7eda7d1b5f75b49104e61f91b (diff) | |
| download | php-git-4a97e3fef67cda8aad4c8fa7ec68e27e58d04b4d.tar.gz | |
Don't allow both and mark the old one as deprecated
| -rw-r--r-- | ext/dom/config.m4 | 4 | ||||
| -rw-r--r-- | ext/domxml/config.m4 | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index c214474391..5ae7fe78d9 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -23,6 +23,10 @@ PHP_ARG_WITH(dom5, for DOM support, [ --with-dom5[=DIR] Include new DOM support (requires libxml >= 2.4.14). DIR is the libxml install directory.]) +if test "$PHP_DOM" != "no" -a "$PHP_DOM5" != "no"; then + AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.]) +fi + if test -z "$PHP_ZLIB_DIR"; then PHP_ARG_WITH(zlib-dir, for the location of libz, [ --with-zlib-dir[=DIR] DOM: Set the path to libz install prefix.], no, no) diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index 49caa60a62..9d147771df 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -37,9 +37,13 @@ AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[ ]) PHP_ARG_WITH(dom, for DOM support, -[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.14). +[ --with-dom[=DIR] Old deprecated DOM support (requires libxml >= 2.4.14). DIR is the libxml install directory.]) +if test "$PHP_DOM" != "no" -a "$PHP_DOM5" != "no"; then + AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.]) +fi + if test "$PHP_DOM" != "no"; then PHP_LIBXML_DIR=$PHP_DOM |