diff options
| -rw-r--r-- | ext/dom/config.m4 | 6 | ||||
| -rw-r--r-- | ext/domxml/config.m4 | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index 5ae7fe78d9..9a36b71e33 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -19,14 +19,10 @@ AC_DEFUN(PHP_DOM_CHECK_VERSION,[ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for DOM support, +PHP_ARG_WITH(dom5, for new 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 9d147771df..74bc452f7d 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -36,7 +36,7 @@ AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom, for DOM support, +PHP_ARG_WITH(dom, for old deprecated DOM support, [ --with-dom[=DIR] Old deprecated DOM support (requires libxml >= 2.4.14). DIR is the libxml install directory.]) |