]> granicus.if.org Git - php/commitdiff
fix the fix
authorfoobar <sniper@php.net>
Fri, 22 Mar 2002 13:55:11 +0000 (13:55 +0000)
committerfoobar <sniper@php.net>
Fri, 22 Mar 2002 13:55:11 +0000 (13:55 +0000)
ext/rpc/xmlrpc/config.m4
ext/xmlrpc/config.m4
ext/xslt/config.m4

index 774c13b2fb69baf1e6f36c10477c927e04b111d9..2b6b883756e3b1bb93e7c3220dfa0bc5cd5dd9f8 100644 (file)
@@ -32,7 +32,9 @@ if test "$PHP_XMLRPC" != "no"; then
     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])
   ])
index 774c13b2fb69baf1e6f36c10477c927e04b111d9..2b6b883756e3b1bb93e7c3220dfa0bc5cd5dd9f8 100644 (file)
@@ -32,7 +32,9 @@ if test "$PHP_XMLRPC" != "no"; then
     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])
   ])
index 26402760af44c04f06634ae481089c5d23ce3b4d..d9a0968a7901ef737e39b33a7333356297bbfec2 100644 (file)
@@ -69,7 +69,9 @@ if test "$PHP_XSLT" != "no"; then
       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])
     ])