cvs: php4 /ext/xmlrpc config.m4 /ext/xslt config.m4

sniper Fri Mar 22 08:55:09 2002 EDT Modified files: /php4/ext/xslt config.m4 /php4/ext/xmlrpc config.m4 Log: fix the fix Index: php4/ext/xslt/config.m4 diff -u php4/ext/xslt/config.m4:1.20 php4/ext/xslt/config.m4:1.21 --- php4/ext/xslt/config.m4:1.20 Fri Mar 22 08:49:05 2002 +++ php4/ext/xslt/config.m4 Fri Mar 22 08:55:09 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20 2002/03/22 13:49:05 sniper Exp $ +dnl $Id: config.m4,v 1.21 2002/03/22 13:55:09 sniper Exp $ dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | @@ -69,7 +69,9 @@ PHP_ADD_LIBRARY(xmltok) fi - PHP_ICONV=yes + 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]) ]) Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.13 php4/ext/xmlrpc/config.m4:1.14 --- php4/ext/xmlrpc/config.m4:1.13 Fri Mar 22 08:48:54 2002 +++ php4/ext/xmlrpc/config.m4 Fri Mar 22 08:55:09 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2002/03/22 13:48:54 sniper Exp $ +dnl $Id: config.m4,v 1.14 2002/03/22 13:55:09 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -32,7 +32,9 @@ AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>) fi - PHP_ICONV=yes + 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]) ])