From bdb6726abe105ed199d32940b3f81a8930cb1012 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Sun, 6 Jul 2008 16:55:01 +0000 Subject: [PATCH] - MFB: don't enable xmlrpc when libxml is missing --- ext/xmlrpc/config.w32 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 8c399cd1479..1919eb53aca 100644 --- a/ext/xmlrpc/config.w32 +++ b/ext/xmlrpc/config.w32 @@ -4,11 +4,18 @@ 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"; + } }