diff options
| author | foobar <sniper@php.net> | 2002-03-22 13:55:11 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-03-22 13:55:11 +0000 |
| commit | cf267402b5d9c6054494820daeb75be2ea5bfe1b (patch) | |
| tree | 1fd91af119b9b11eed3faafcc927fa339f7cc6e5 | |
| parent | 35e7255055a9699ec15434070d4c772e615d81bb (diff) | |
| download | php-git-cf267402b5d9c6054494820daeb75be2ea5bfe1b.tar.gz | |
fix the fix
| -rw-r--r-- | ext/rpc/xmlrpc/config.m4 | 4 | ||||
| -rw-r--r-- | ext/xmlrpc/config.m4 | 4 | ||||
| -rw-r--r-- | ext/xslt/config.m4 | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4 index 774c13b2fb..2b6b883756 100644 --- a/ext/rpc/xmlrpc/config.m4 +++ b/ext/rpc/xmlrpc/config.m4 @@ -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]) ]) diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 774c13b2fb..2b6b883756 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -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]) ]) diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index 26402760af..d9a0968a79 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -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]) ]) |