helly Sat Jun 14 07:27:50 2003 EDT
Modified files:
/php4/ext/dom config.m4
/php4/ext/domxml config.m4
Log:
Don't allow both and mark the old one as deprecated
Index: php4/ext/dom/config.m4
diff -u php4/ext/dom/config.m4:1.1 php4/ext/dom/config.m4:1.2
--- php4/ext/dom/config.m4:1.1 Thu Jun 5 13:06:52 2003
+++ php4/ext/dom/config.m4 Sat Jun 14 07:27:49 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.1 2003/06/05 17:06:52 rrichards Exp $
+dnl $Id: config.m4,v 1.2 2003/06/14 11:27:49 helly Exp $
dnl
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
@@ -22,6 +22,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,
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.47 php4/ext/domxml/config.m4:1.48
--- php4/ext/domxml/config.m4:1.47 Wed Jun 11 15:25:32 2003
+++ php4/ext/domxml/config.m4 Sat Jun 14 07:27:49 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.47 2003/06/11 19:25:32 rrichards Exp $
+dnl $Id: config.m4,v 1.48 2003/06/14 11:27:49 helly Exp $
dnl
AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
@@ -37,8 +37,12 @@
])
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 CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
