cvs: php4 /ext/domxml config.m4
| From: | Joseph Tate | Date: | Fri, 08 Mar 2002 18:56:02 +0000 |
| Subject: | cvs: php4 /ext/domxml config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9834@lists.php.net to get a copy of this message | ||
jtate Fri Mar 8 13:56:02 2002 EDT
Modified files:
/php4/ext/domxml config.m4
Log:
Added linking files to make build compatible with RH 7.2's updated libxslt
packages. Should not break when compiling with older versions. This may
fix bug #15942 as well.
Configure was giving a Warning message without these lines when --with-xslt was
specified.
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.34 php4/ext/domxml/config.m4:1.35
--- php4/ext/domxml/config.m4:1.34 Thu Mar 7 09:18:30 2002
+++ php4/ext/domxml/config.m4 Fri Mar 8 13:56:00 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.34 2002/03/07 14:18:30 sas Exp $
+dnl $Id: config.m4,v 1.35 2002/03/08 18:56:00 jtate Exp $
dnl
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
@@ -132,6 +132,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)