cvs: php4(php_4_0_4) /ext/domxml config.m4
| From: | Jani Taskinen | Date: | Fri, 08 Dec 2000 13:13:04 +0000 |
| Subject: | cvs: php4(php_4_0_4) /ext/domxml config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3030@lists.php.net to get a copy of this message | ||
sniper Fri Dec 8 05:13:04 2000 EDT
Branch: php_4_0_4
Modified files:
/php4/ext/domxml config.m4
Log:
Merge changes from HEAD.
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.16.2.1 php4/ext/domxml/config.m4:1.16.2.2
--- php4/ext/domxml/config.m4:1.16.2.1 Wed Dec 6 09:41:40 2000
+++ php4/ext/domxml/config.m4 Fri Dec 8 05:13:04 2000
@@ -1,8 +1,25 @@
-dnl $Id: config.m4,v 1.16.2.1 2000/12/06 17:41:40 sas Exp $
+dnl $Id: config.m4,v 1.16.2.2 2000/12/08 13:13:04 sniper Exp $
dnl config.m4 for extension domxml
+AC_DEFUN(PHP_DOM_CHECK_VERSION,[
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="-I$DOMXML_DIR/include"
+ AC_MSG_CHECKING(for libxml version)
+ AC_EGREP_CPP(yes,[
+ #include <libxml/xmlversion.h>
+ #if LIBXML_VERSION >= 20207
+ yes
+ #endif
+ ],[
+ AC_MSG_RESULT(>= 2.2.7)
+ ],[
+ AC_MSG_ERROR(libxml version 2.2.7 or greater required.)
+ ])
+ CPPFLAGS=$old_CPPFLAGS
+])
+
PHP_ARG_WITH(dom, for DOM support,
-[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0).
+[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.2.7).
DIR is the libxml install directory,
defaults to /usr.])
@@ -22,9 +39,11 @@
if test -z "$DOMXML_DIR"; then
AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please reinstall the libxml >= 2.0 distribution)
+ AC_MSG_ERROR(Please reinstall the libxml >= 2.2.7 distribution)
fi
+ PHP_DOM_CHECK_VERSION
+
AC_ADD_INCLUDE($DOMXML_DIR/include)
PHP_SUBST(DOMXML_SHARED_LIBADD)
@@ -52,8 +71,7 @@
LIBS="$LIBS -L$withval/lib -lz"
fi
- AC_CHECK_LIB(xml, xmlFreeURI, [AC_DEFINE(HAVE_DOMXML,1,[ ])],
- [AC_MSG_ERROR(DOM module requires libxml >= 2.0)])
+ AC_DEFINE(HAVE_DOMXML,1,[ ])
AC_ADD_LIBRARY(z)
PHP_EXTENSION(domxml, $ext_shared)