diff options
| author | Scott MacVicar <scottmac@php.net> | 2009-04-27 17:49:18 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2009-04-27 17:49:18 +0000 |
| commit | 4e15260d1317a8173a66f380ec28c09111e35c2b (patch) | |
| tree | 68cd4139100aabc71cc55d25c67b8b21c5ff7af8 | |
| parent | 3386794febb24fcbce2ed8cac98a59cdb99d6bfa (diff) | |
| download | php-git-4e15260d1317a8173a66f380ec28c09111e35c2b.tar.gz | |
Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use different iconv versions. Could also just add a dependency on iconv to fix this.
| -rw-r--r-- | ext/xmlrpc/config.m4 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 7f7277d4df..389d4adaf0 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -61,17 +61,21 @@ if test "$PHP_XMLRPC" != "no"; then fi fi - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR - fi + dnl if iconv is shared or missing then we should build iconv ourselves + if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then + + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR + fi - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then - PHP_ICONV=yes - fi + if test -z "$PHP_ICONV" || 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]) - ]) + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) + fi fi if test "$PHP_XMLRPC" = "yes"; then |