sniper Wed Sep 24 18:56:00 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/xslt config.m4
Log:
- Fixed bug #25648 (xslt_set_encoding() being not detected correctly)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.406 php-src/NEWS:1.1247.2.407
--- php-src/NEWS:1.1247.2.406 Wed Sep 24 04:28:26 2003
+++ php-src/NEWS Wed Sep 24 18:55:58 2003
@@ -7,6 +7,7 @@
- Fixed crash bug when non-existing save/serializer handler was used. (Jani)
- Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
- Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #25648 (xslt_set_encoding() being not detected correctly). (Jani)
- Fixed bug #25636 (SNMP Session not closed on success). (Ilia,
nesslage[at]mwsc[dot]edu)
- Fixed bug #25635 (Make "make tests" to fail due to invalid include_path). (Ilia)
Index: php-src/ext/xslt/config.m4
diff -u php-src/ext/xslt/config.m4:1.30.2.2 php-src/ext/xslt/config.m4:1.30.2.3
--- php-src/ext/xslt/config.m4:1.30.2.2 Wed Apr 23 04:55:00 2003
+++ php-src/ext/xslt/config.m4 Wed Sep 24 18:55:59 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.30.2.2 2003/04/23 08:55:00 sniper Exp $
+dnl $Id: config.m4,v 1.30.2.3 2003/09/24 22:55:59 sniper Exp $
dnl
dnl +------------------------------------------------------------------------------+
dnl | This is where the magic of the extension reallly is. Depending on what |
@@ -56,7 +56,7 @@
if test -z "$XSLT_DIR"; then
AC_MSG_ERROR([not found. Please re-install the $XSLT_BACKEND_NAME distribution.])
fi
-
+
if test "$PHP_XSLT_SABLOT" != "no"; then
AC_MSG_CHECKING([for sablot-config])
if test -x $XSLT_DIR/bin/sablot-config ; then
@@ -132,6 +132,7 @@
PHP_CHECK_LIBRARY(js, JS_GetRuntime,
[
PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD)
+ PHP_SABLOT_JS_LIBS=-L$PHP_SABLOT_JS_DIR/lib -ljs
], [
AC_MSG_ERROR([libjs not found. Please check config.log for more information.])
], [
@@ -143,7 +144,7 @@
[
AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ])
], [], [
- -L$XSLT_DIR/lib
+ -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
])
dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31
@@ -151,7 +152,7 @@
[
AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports
SablotGetOptions])
], [], [
- -L$XSLT_DIR/lib
+ -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS
])
AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
