- Fixed minor inconvenience with iconv detection when iconv is found in libc

diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4
index a7f4fae3b89abb9b19cf68e81630e7e9237814b0..774c13b2fb69baf1e6f36c10477c927e04b111d9 100644 (file)
--- a/ext/rpc/xmlrpc/config.m4
+++ b/ext/rpc/xmlrpc/config.m4
@@ -32,6 +32,7 @@ if test "$PHP_XMLRPC" != "no"; then
     AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
   fi
 
+  PHP_ICONV=yes
   PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
     AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
   ])

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index a7f4fae3b89abb9b19cf68e81630e7e9237814b0..774c13b2fb69baf1e6f36c10477c927e04b111d9 100644 (file)
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -32,6 +32,7 @@ if test "$PHP_XMLRPC" != "no"; then
     AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
   fi
 
+  PHP_ICONV=yes
   PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
     AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
   ])

diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4
index b05dfcfc7f2abacfdc65553157d615d63ff2c030..26402760af44c04f06634ae481089c5d23ce3b4d 100644 (file)
--- a/ext/xslt/config.m4
+++ b/ext/xslt/config.m4
@@ -69,6 +69,7 @@ if test "$PHP_XSLT" != "no"; then
       PHP_ADD_LIBRARY(xmltok)
     fi
 
+    PHP_ICONV=yes
     PHP_SETUP_ICONV(XSLT_SHARED_LIBADD, [], [
       AC_MSG_ERROR([iconv not found, in order to build sablotron you need the iconv library])
     ])