cvs: php4 /ext/domxml config.m4
| From: | Jani Taskinen | Date: | Mon, 29 Jan 2001 23:15:12 +0000 |
| Subject: | cvs: php4 /ext/domxml config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3806@lists.php.net to get a copy of this message | ||
sniper Mon Jan 29 15:15:12 2001 EDT
Modified files:
/php4/ext/domxml config.m4
Log:
Fixed bug #8946. In some systems the libxml.* is actually libxml2.*
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.19 php4/ext/domxml/config.m4:1.20
--- php4/ext/domxml/config.m4:1.19 Fri Dec 8 05:09:32 2000
+++ php4/ext/domxml/config.m4 Mon Jan 29 15:15:11 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.19 2000/12/08 13:09:32 sniper Exp $
+dnl $Id: config.m4,v 1.20 2001/01/29 23:15:11 sniper Exp $
dnl config.m4 for extension domxml
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
@@ -46,8 +46,14 @@
AC_ADD_INCLUDE($DOMXML_DIR/include)
+ if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
+ DOM_LIBNAME="xml2"
+ else
+ DOM_LIBNAME="xml"
+ fi
+
PHP_SUBST(DOMXML_SHARED_LIBADD)
- AC_ADD_LIBRARY_WITH_PATH(xml, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
if test $HAVE_ZLIB; then
old_withval=$withval