cvs: php4 /ext/xmlrpc config.m4 xmlrpc-epi-php.c

sniper Thu Aug 29 22:57:13 2002 EDT Modified files: /php4/ext/xmlrpc config.m4 xmlrpc-epi-php.c Log: Fix bug: #19124, xmlrpc extension builds ok now as shared extension. Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.16 php4/ext/xmlrpc/config.m4:1.17 --- php4/ext/xmlrpc/config.m4:1.16 Sun Jul 28 17:03:24 2002 +++ php4/ext/xmlrpc/config.m4 Thu Aug 29 22:57:11 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.16 2002/07/28 21:03:24 yohgaki Exp $ +dnl $Id: config.m4,v 1.17 2002/08/30 02:57:11 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -15,6 +15,9 @@ 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 @@ 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]) ]) Index: php4/ext/xmlrpc/xmlrpc-epi-php.c diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.23 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.24 --- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.23 Tue Aug 13 00:36:18 2002 +++ php4/ext/xmlrpc/xmlrpc-epi-php.c Thu Aug 29 22:57:12 2002 @@ -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"