cvs: php4(PHP_4_0_7) /ext/domxml config.m4
| From: | Derick Rethans | Date: | Thu, 04 Oct 2001 06:42:45 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /ext/domxml config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7640@lists.php.net to get a copy of this message | ||
derick Thu Oct 4 02:42:45 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/ext/domxml config.m4
Log:
MFH
# (thought this already has been done)
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.26.2.2 php4/ext/domxml/config.m4:1.26.2.3
--- php4/ext/domxml/config.m4:1.26.2.2 Thu Sep 6 20:28:26 2001
+++ php4/ext/domxml/config.m4 Thu Oct 4 02:42:45 2001
@@ -1,9 +1,9 @@
-dnl $Id: config.m4,v 1.26.2.2 2001/09/07 00:28:26 sniper Exp $
+dnl $Id: config.m4,v 1.26.2.3 2001/10/04 06:42:45 derick Exp $
dnl config.m4 for extension domxml
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$DOMXML_DIR/include
+ CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
AC_MSG_CHECKING(for libxml version)
AC_EGREP_CPP(yes,[
#include <libxml/xmlversion.h>
@@ -25,11 +25,16 @@
if test "$PHP_DOM" != "no"; then
+ DOMXML_DIR_ADD=""
if test -r $PHP_DOM/include/libxml/tree.h; then
DOMXML_DIR=$PHP_DOM
+ elif test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
+ DOMXML_DIR=$PHP_DOM
+ DOMXML_DIR_ADD="/libxml2"
else
for i in /usr/local /usr; do
test -r $i/include/libxml/tree.h && DOMXML_DIR=$i
+ test -r $i/include/libxml2/libxml/tree.h && DOMXML_DIR=$i &&
DOMXML_DIR_ADD="/libxml2"
done
fi
@@ -47,7 +52,7 @@
fi
PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
- PHP_ADD_INCLUDE($DOMXML_DIR/include)
+ PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
if test "$PHP_ZLIB_DIR" = "no"; then
AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)