MFH: Fix for bug: #19124 (shared extension build fixes)

4 files changed, 32 insertions, 10 deletions

diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4
index 2569fc5f61..2123fd67ae 100644
--- a/ext/rpc/xmlrpc/config.m4
+++ b/ext/rpc/xmlrpc/config.m4
@@ -10,12 +10,18 @@ sinclude(libxmlrpc/xmlrpc.m4)
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
 [  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support.])
 
+xmlrpc_ext_shared=$ext_shared
+
 PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
 [  --with-expat-dir=DIR      XMLRPC-EPI: libexpat dir for XMLRPC-EPI.])
 
+PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
+[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI.])
+
+
 if test "$PHP_XMLRPC" != "no"; then
 
-  PHP_EXTENSION(xmlrpc, $ext_shared)
+  PHP_EXTENSION(xmlrpc, $xmlrpc_ext_shared)
   PHP_SUBST(XMLRPC_SHARED_LIBADD)
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
@@ -33,6 +39,10 @@ if test "$PHP_XMLRPC" != "no"; then
     AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
   fi
 
+  if test "$PHP_ICONV_DIR" != "no"; then
+    PHP_ICONV=$PHP_ICONV_DIR
+  fi
+
   if test "$PHP_ICONV" = "no"; then
     PHP_ICONV=yes
   fi
@@ -49,7 +59,7 @@ if test "$PHP_XMLRPC" = "yes"; then
   XMLRPC_SUBDIRS=libxmlrpc
   PHP_SUBST(XMLRPC_LIBADD)
   PHP_SUBST(XMLRPC_SUBDIRS)
-  LIB_BUILD($ext_builddir/libxmlrpc,$ext_shared,yes)
+  LIB_BUILD($ext_builddir/libxmlrpc,$xmlrpc_ext_shared,yes)
   PHP_ADD_INCLUDE($ext_srcdir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin
 
diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
index dc9e3cdbba..b595295c60 100644
--- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
@@ -59,13 +59,14 @@
 *    of null, when the right thing may be no value at all. (SOAP)     *
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"
 #include "php_ini.h"
 #include "php_xmlrpc.h"
-#ifndef PHP_WIN32
-#include "php_config.h"
-#endif
 #include "xmlrpc.h"
 
 #define PHP_EXT_VERSION "0.50"
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 2569fc5f61..2123fd67ae 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -10,12 +10,18 @@ sinclude(libxmlrpc/xmlrpc.m4)
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
 [  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support.])
 
+xmlrpc_ext_shared=$ext_shared
+
 PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
 [  --with-expat-dir=DIR      XMLRPC-EPI: libexpat dir for XMLRPC-EPI.])
 
+PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
+[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI.])
+
+
 if test "$PHP_XMLRPC" != "no"; then
 
-  PHP_EXTENSION(xmlrpc, $ext_shared)
+  PHP_EXTENSION(xmlrpc, $xmlrpc_ext_shared)
   PHP_SUBST(XMLRPC_SHARED_LIBADD)
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
@@ -33,6 +39,10 @@ if test "$PHP_XMLRPC" != "no"; then
     AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
   fi
 
+  if test "$PHP_ICONV_DIR" != "no"; then
+    PHP_ICONV=$PHP_ICONV_DIR
+  fi
+
   if test "$PHP_ICONV" = "no"; then
     PHP_ICONV=yes
   fi
@@ -49,7 +59,7 @@ if test "$PHP_XMLRPC" = "yes"; then
   XMLRPC_SUBDIRS=libxmlrpc
   PHP_SUBST(XMLRPC_LIBADD)
   PHP_SUBST(XMLRPC_SUBDIRS)
-  LIB_BUILD($ext_builddir/libxmlrpc,$ext_shared,yes)
+  LIB_BUILD($ext_builddir/libxmlrpc,$xmlrpc_ext_shared,yes)
   PHP_ADD_INCLUDE($ext_srcdir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index dc9e3cdbba..b595295c60 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -59,13 +59,14 @@
 *    of null, when the right thing may be no value at all. (SOAP)     *
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "php.h"
 #include "ext/standard/info.h"
 #include "php_ini.h"
 #include "php_xmlrpc.h"
-#ifndef PHP_WIN32
-#include "php_config.h"
-#endif
 #include "xmlrpc.h"
 
 #define PHP_EXT_VERSION "0.50"