cvs: php4(PHP_4_2_0) /ext/domxml config.m4

sniper Sat Mar 9 16:38:36 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/domxml config.m4 Log: MFH fix for bug #15686 and some exslt fix. Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.33 php4/ext/domxml/config.m4:1.33.2.1 --- php4/ext/domxml/config.m4:1.33 Fri Jan 18 02:58:47 2002 +++ php4/ext/domxml/config.m4 Sat Mar 9 16:38:35 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2002/01/18 07:58:47 chregu Exp $ +dnl $Id: config.m4,v 1.33.2.1 2002/03/09 21:38:35 sniper Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -51,7 +51,15 @@ DOM_LIBNAME=xml fi - PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + XML2_CONFIG=$DOMXML_DIR/bin/xml2-config + + if test -x $XML2_CONFIG; then + DOM_LIBS=$XML2_CONFIG --libs + PHP_EVAL_LIBLINE($DOM_LIBS, DOMXML_SHARED_LIBADD) + else + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + fi + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) if test "$PHP_ZLIB_DIR" = "no"; then @@ -104,7 +112,7 @@ DIR is the libxslt install directory.]) PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, -[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3). +[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3). DIR is the libexslt install directory.]) if test "$PHP_DOM_XSLT" != "no"; then @@ -132,6 +140,19 @@ AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>) fi + if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then + DOM_LIBNAME=xml2 + else + DOM_LIBNAME=xml + fi + + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) + + if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then + PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + fi + AC_DEFINE(HAVE_DOMXSLT,1,[ ]) PHP_SUBST(DOMXML_SHARED_LIBADD)