Don't allow both and mark the old one as deprecated

diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index c2144743915728879a4f6bde2caea3add5308da8..5ae7fe78d9322a44b4b9e9eb5318285b995c22d8 100644 (file)
--- 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 49caa60a62564a88d6555559686d849385355c55..9d147771df327d6f48ac712a9bbc6d81f4b223d5 100644 (file)
--- 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