diff options
| author | foobar <sniper@php.net> | 2002-08-30 02:57:13 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-08-30 02:57:13 +0000 |
| commit | 4e34d6ce270139cd430371fa251b27c53c97429e (patch) | |
| tree | 718d2ca3f0ddd3c2f7afbf4f77e93fec40f24adc | |
| parent | 55b22b16a21fc75c76febdbb56b4d3fb42f29b14 (diff) | |
| download | php-git-4e34d6ce270139cd430371fa251b27c53c97429e.tar.gz | |
Fix bug: #19124, xmlrpc extension builds ok now as shared extension.
| -rw-r--r-- | ext/rpc/xmlrpc/config.m4 | 8 | ||||
| -rw-r--r-- | ext/rpc/xmlrpc/xmlrpc-epi-php.c | 7 | ||||
| -rw-r--r-- | ext/xmlrpc/config.m4 | 8 | ||||
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 7 |
4 files changed, 24 insertions, 6 deletions
diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4 index b0cf506039..ac923ab96b 100644 --- a/ext/rpc/xmlrpc/config.m4 +++ b/ext/rpc/xmlrpc/config.m4 @@ -15,6 +15,9 @@ 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_SUBST(XMLRPC_SHARED_LIBADD) @@ -34,9 +37,14 @@ 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 + 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/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c index 460ca9bd97..8ffa8ce989 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.51" diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index b0cf506039..ac923ab96b 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -15,6 +15,9 @@ 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_SUBST(XMLRPC_SHARED_LIBADD) @@ -34,9 +37,14 @@ 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 + 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/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 460ca9bd97..8ffa8ce989 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.51" |