pajoye Sun Jul 6 16:55:01 2008 UTC
Modified files:
/php-src/ext/xmlrpc config.w32
Log:
- MFB: don't enable xmlrpc when libxml is missing
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlrpc/config.w32
diff -u php-src/ext/xmlrpc/config.w32:1.2 php-src/ext/xmlrpc/config.w32:1.3
--- php-src/ext/xmlrpc/config.w32:1.2 Mon Dec 22 13:16:42 2003
+++ php-src/ext/xmlrpc/config.w32 Sun Jul 6 16:55:01 2008
@@ -1,14 +1,21 @@
-// $Id: config.w32,v 1.2 2003/12/22 13:16:42 wez Exp $
+// $Id: config.w32,v 1.3 2008/07/06 16:55:01 pajoye Exp $
// vim:ft=javascript
ARG_WITH("xmlrpc", "XMLRPC-EPI support", "no");
if (PHP_XMLRPC != "no") {
- CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC",
configure_module_dirname + "/libxmlrpc");
- EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");
- ADD_SOURCES(configure_module_dirname + "/libxmlrpc", "base64.c
simplestring.c xml_to_dandarpc.c \
- xmlrpc_introspection.c encodings.c system_methods.c xml_to_xmlrpc.c \
- queue.c xml_element.c xmlrpc.c xml_to_soap.c", "xmlrpc");
- ADD_EXTENSION_DEP('xmlrpc', 'libxml');
+ if (CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC",
configure_module_dirname + "/libxmlrpc")
+ && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS")
+ && ADD_EXTENSION_DEP('xmlrpc', 'libxml')) {
+
+ EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");
+ ADD_SOURCES(configure_module_dirname + "/libxmlrpc", "base64.c
simplestring.c xml_to_dandarpc.c \
+ xmlrpc_introspection.c encodings.c system_methods.c
xml_to_xmlrpc.c \
+ queue.c xml_element.c xmlrpc.c xml_to_soap.c", "xmlrpc");
+
+ } else {
+ WARNING("xmlrpc support can't be enabled, libraries or headers
are missing")
+ PHP_XMLRPC = "no";
+ }
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
