cvs: php4(PHP_4_2_0) /ext/xmlrpc config.m4 /ext/xslt config.m4
| From: | Jani Taskinen | Date: | Tue, 26 Mar 2002 00:15:29 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/xmlrpc config.m4 /ext/xslt config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10685@lists.php.net to get a copy of this message | ||
sniper Mon Mar 25 19:15:29 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/xmlrpc config.m4
/php4/ext/xslt config.m4
Log:
MFH fixes for the iconv stuff
Index: php4/ext/xmlrpc/config.m4
diff -u php4/ext/xmlrpc/config.m4:1.8.2.3 php4/ext/xmlrpc/config.m4:1.8.2.4
--- php4/ext/xmlrpc/config.m4:1.8.2.3 Mon Mar 18 20:08:17 2002
+++ php4/ext/xmlrpc/config.m4 Mon Mar 25 19:15:29 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8.2.3 2002/03/19 01:08:17 ssb Exp $
+dnl $Id: config.m4,v 1.8.2.4 2002/03/26 00:15:29 sniper Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -33,6 +33,9 @@
AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
fi
+ if test "$PHP_ICONV" = "no"; then
+ PHP_ICONV=yes
+ fi
PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
])
Index: php4/ext/xslt/config.m4
diff -u php4/ext/xslt/config.m4:1.14.2.3 php4/ext/xslt/config.m4:1.14.2.4
--- php4/ext/xslt/config.m4:1.14.2.3 Mon Mar 18 20:08:16 2002
+++ php4/ext/xslt/config.m4 Mon Mar 25 19:15:29 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14.2.3 2002/03/19 01:08:16 ssb Exp $
+dnl $Id: config.m4,v 1.14.2.4 2002/03/26 00:15:29 sniper Exp $
dnl
dnl +------------------------------------------------------------------------------+
dnl | This is where the magic of the extension reallly is. Depending on what |
@@ -56,7 +56,7 @@
if test "$PHP_XSLT_SABLOT" != "no"; then
found_expat=no
for i in $PHP_EXPAT_DIR $XSLT_DIR; do
- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then
+ if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
PHP_ADD_INCLUDE($i/include)
PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)
@@ -69,6 +69,9 @@
PHP_ADD_LIBRARY(xmltok)
fi
+ if test "$PHP_ICONV" = "no"; then
+ PHP_ICONV=yes
+ fi
PHP_SETUP_ICONV(XSLT_SHARED_LIBADD, [], [
AC_MSG_ERROR([iconv not found, in order to build sablotron you need the iconv library])
])