Skip to content

Commit 74476dc

Browse files
committed
Improve/fix preventing both enabled
1 parent 12804f5 commit 74476dc

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ext/dom/config.m4

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ AC_DEFUN(PHP_DOM_CHECK_VERSION,[
1919
CPPFLAGS=$old_CPPFLAGS
2020
])
2121

22-
PHP_ARG_WITH(dom5, for DOM support,
22+
PHP_ARG_WITH(dom5, for new 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-
3026
if test -z "$PHP_ZLIB_DIR"; then
3127
PHP_ARG_WITH(zlib-dir, for the location of libz,
3228
[ --with-zlib-dir[=DIR] DOM: Set the path to libz install prefix.], no, no)

ext/domxml/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
3636
CPPFLAGS=$old_CPPFLAGS
3737
])
3838

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

0 commit comments

Comments
 (0)