cvs: php4 /ext/domxml config.m4
| From: | Jani Taskinen | Date: | Sat, 09 Mar 2002 21:30:13 +0000 |
| Subject: | cvs: php4 /ext/domxml config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9857@lists.php.net to get a copy of this message | ||
sniper Sat Mar 9 16:30:13 2002 EDT
Modified files:
/php4/ext/domxml config.m4
Log:
- Fixed bug: #15686
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.35 php4/ext/domxml/config.m4:1.36
--- php4/ext/domxml/config.m4:1.35 Fri Mar 8 13:56:00 2002
+++ php4/ext/domxml/config.m4 Sat Mar 9 16:30:12 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.35 2002/03/08 18:56:00 jtate Exp $
+dnl $Id: config.m4,v 1.36 2002/03/09 21:30:12 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