From 7fbf3433c7705b2ada80847d297cef498ea83855 Mon Sep 17 00:00:00 2001
From: Scott MacVicar <scottmac@php.net>
Date: Mon, 27 Apr 2009 18:38:58 +0000
Subject: [PATCH] MFH 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.

---
 NEWS                 |  2 ++
 ext/xmlrpc/config.m4 | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 6a24e56d6c3..824319c45d7 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,8 @@ PHP                                                                        NEWS
   (crrodriguez at opensuse dot org, Ilia)
 - Fixed bug #47704 (PHP crashes on some "bad" operations with string offsets).
   (Dmitry)
+- Fixed bug #47695 (build error when xmlrpc and iconv are compiled
+  against different iconv versions). (Scott)
 - Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect).
   (Mikko, Pierre)
 - Fixed bug #47644 (Valid integers are truncated with json_decode()). (Scott)
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 7f7277d4df9..389d4adaf01 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