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

sniper Thu Aug 29 23:06:53 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/xmlrpc config.m4 xmlrpc-epi-php.c Log: MFH: Fix for bug: #19124 (shared extension build fixes) Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.8.2.5 php4/ext/xmlrpc/config.m4:1.8.2.6 --- php4/ext/xmlrpc/config.m4:1.8.2.5 Sun Jul 28 17:03:49 2002 +++ php4/ext/xmlrpc/config.m4 Thu Aug 29 23:06:52 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.5 2002/07/28 21:03:49 yohgaki Exp $ +dnl $Id: config.m4,v 1.8.2.6 2002/08/30 03:06:52 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -10,12 +10,18 @@ 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 @@ 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 @@ 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 Index: php4/ext/xmlrpc/xmlrpc-epi-php.c diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.14 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.14.2.1 --- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.14 Thu Feb 28 03:26:59 2002 +++ php4/ext/xmlrpc/xmlrpc-epi-php.c Thu Aug 29 23:06:52 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.50"