cvs: php4 /ext/domxml config.m4

derick Wed Sep 26 15:02:33 2001 EDT Modified files: /php4/ext/domxml config.m4 Log: - This patch adds proper header file detection on system which simultaneously isntallied libxml1 and libxml2 (eg. Debian) (patch by Markus Fischer <mfischer@php.net>) Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.28 php4/ext/domxml/config.m4:1.29 --- php4/ext/domxml/config.m4:1.28 Thu Sep 6 20:24:01 2001 +++ php4/ext/domxml/config.m4 Wed Sep 26 15:02:33 2001 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.28 2001/09/07 00:24:01 sniper Exp $ +dnl $Id: config.m4,v 1.29 2001/09/26 19:02:33 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>)