Improve/fix preventing both enabled

diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 5ae7fe78d9322a44b4b9e9eb5318285b995c22d8..9a36b71e33700d21ac13445c0eb68bf48ca69626 100644 (file)
--- 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 9d147771df327d6f48ac712a9bbc6d81f4b223d5..74bc452f7dc7e0ec2375af7def7e03d8ddda4305 100644 (file)
--- 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.])