diff options
| author | foobar <sniper@php.net> | 2003-09-24 22:55:59 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-09-24 22:55:59 +0000 |
| commit | 925a3b6ba820b107af444e800704d202dd9ad530 (patch) | |
| tree | a800186ace456aacbea3f06537fbd670217569bc | |
| parent | 149d034a81bc360d5a352078702876a6c6641038 (diff) | |
| download | php-git-925a3b6ba820b107af444e800704d202dd9ad530.tar.gz | |
- Fixed bug #25648 (xslt_set_encoding() being not detected correctly)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/xslt/config.m4 | 7 |
2 files changed, 5 insertions, 3 deletions
@@ -7,6 +7,7 @@ PHP 4 NEWS - 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) diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index e29e244093..bb1f96a6e1 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -56,7 +56,7 @@ if test "$PHP_XSLT" != "no"; then 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 @@ int main () 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 @@ int main () [ 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 @@ int main () [ 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, [ ]) |