Skip to content

Commit 4a97e3f

Browse files
committed
Don't allow both and mark the old one as deprecated
1 parent 68ff4be commit 4a97e3f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

ext/dom/config.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ PHP_ARG_WITH(dom5, for DOM support,
2323
[ --with-dom5[=DIR] Include new DOM support (requires libxml >= 2.4.14).
2424
DIR is the libxml install directory.])
2525

26+
if test "$PHP_DOM" != "no" -a "$PHP_DOM5" != "no"; then
27+
AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.])
28+
fi
29+
2630
if test -z "$PHP_ZLIB_DIR"; then
2731
PHP_ARG_WITH(zlib-dir, for the location of libz,
2832
[ --with-zlib-dir[=DIR] DOM: Set the path to libz install prefix.], no, no)

ext/domxml/config.m4

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
3737
])
3838

3939
PHP_ARG_WITH(dom, for DOM support,
40-
[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.14).
40+
[ --with-dom[=DIR] Old deprecated DOM support (requires libxml >= 2.4.14).
4141
DIR is the libxml install directory.])
4242

43+
if test "$PHP_DOM" != "no" -a "$PHP_DOM5" != "no"; then
44+
AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.])
45+
fi
46+
4347
if test "$PHP_DOM" != "no"; then
4448

4549
PHP_LIBXML_DIR=$PHP_DOM

0 commit comments

Comments
 (0)