helly Sat Jun 14 09:35:09 2003 EDT
Modified files:
/php4/ext/domxml config.m4
/php4/ext/dom config.m4
Log:
Improve/fix preventing both enabled
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.48 php4/ext/domxml/config.m4:1.49
--- php4/ext/domxml/config.m4:1.48 Sat Jun 14 07:27:49 2003
+++ php4/ext/domxml/config.m4 Sat Jun 14 09:35:09 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.48 2003/06/14 11:27:49 helly Exp $
+dnl $Id: config.m4,v 1.49 2003/06/14 13:35:09 helly Exp $
dnl
AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
@@ -36,7 +36,7 @@
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.])
Index: php4/ext/dom/config.m4
diff -u php4/ext/dom/config.m4:1.2 php4/ext/dom/config.m4:1.3
--- php4/ext/dom/config.m4:1.2 Sat Jun 14 07:27:49 2003
+++ php4/ext/dom/config.m4 Sat Jun 14 09:35:09 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.2 2003/06/14 11:27:49 helly Exp $
+dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $
dnl
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
@@ -19,13 +19,9 @@
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,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
