com php-src: improve searchability for libxml2 headers: ext/dom/config.w32 ext/libxml/config.w32 ext/simplexml/config.w32 ext/soap/config.w32
ext/wddx/config.w32 ext/xml/config.w32 ext/xmlreader/config.w32 ext/xmlrpc/config.w32
| From: | Anatol Belski | Date: | Sun, 10 May 2015 20:22:03 +0000 |
| Subject: | com php-src: improve searchability for libxml2 headers: ext/dom/config.w32 ext/libxml/config.w32 ext/simplexml/config.w32 ext/soap/config.w32 ext/wddx/config.w32 ext/xml/config.w32 ext/xmlreader/config.w32 ext/xmlrpc/config.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86667@lists.php.net to get a copy of this message | ||
Commit: becfdeb2ffe0927a74952e026158d33a6c0ac83d
Author: Anatol Belski <ab@php.net> Sun, 10 May 2015 21:28:20 +0200
Parents: e570bb430d83c93e5e06505349222996c6072003
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=becfdeb2ffe0927a74952e026158d33a6c0ac83d
Log:
improve searchability for libxml2 headers
and bring the configs inline with the current libxml2 build
Changed paths:
M ext/dom/config.w32
M ext/libxml/config.w32
M ext/simplexml/config.w32
M ext/soap/config.w32
M ext/wddx/config.w32
M ext/xml/config.w32
M ext/xmlreader/config.w32
M ext/xmlrpc/config.w32
Diff:
diff --git a/ext/dom/config.w32 b/ext/dom/config.w32
index 0e8e12b..14a6c46 100644
--- a/ext/dom/config.w32
+++ b/ext/dom/config.w32
@@ -4,7 +4,10 @@
ARG_WITH("dom", "DOM support", "yes");
if (PHP_DOM == "yes") {
- if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('dom',
'libxml')) {
+ if (PHP_LIBXML == "yes" &&
+ ADD_EXTENSION_DEP('dom', 'libxml') &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_DOM", PHP_PHP_BUILD +
"\\include\\libxml2")
+ ) {
EXTENSION("dom", "php_dom.c attr.c document.c domerrorhandler.c \
domstringlist.c domexception.c namelist.c processinginstruction.c \
cdatasection.c documentfragment.c domimplementation.c element.c \
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index e6ad0dc..99f8439 100644
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -6,7 +6,8 @@ ARG_WITH("libxml", "LibXML support", "yes");
if (PHP_LIBXML == "yes") {
if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
CHECK_LIB("libiconv_a.lib;iconv_a.lib;libiconv.lib;iconv.lib", "libxml")
&&
- CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML") &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_LIBXML", PHP_PHP_BUILD +
"\\include\\libxml2") &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_LIBXML", PHP_PHP_BUILD +
"\\include\\libxml2") &&
ADD_EXTENSION_DEP('libxml', 'iconv')) {
EXTENSION("libxml", "libxml.c", false /* never shared */,
"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
diff --git a/ext/simplexml/config.w32 b/ext/simplexml/config.w32
index d581fc8..7873dec 100644
--- a/ext/simplexml/config.w32
+++ b/ext/simplexml/config.w32
@@ -4,8 +4,10 @@
ARG_WITH("simplexml", "Simple XML support", "yes");
if (PHP_SIMPLEXML == "yes") {
- if(PHP_LIBXML == "yes"
- && ADD_EXTENSION_DEP('simplexml', 'libxml')) {
+ if(PHP_LIBXML == "yes" &&
+ ADD_EXTENSION_DEP('simplexml', 'libxml') &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_SIMPLEXML", PHP_PHP_BUILD +
"\\include\\libxml2")
+ ) {
EXTENSION("simplexml", "simplexml.c sxe.c");
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
if (!PHP_SIMPLEXML_SHARED) {
diff --git a/ext/soap/config.w32 b/ext/soap/config.w32
index bb26a90..1124eb2 100644
--- a/ext/soap/config.w32
+++ b/ext/soap/config.w32
@@ -4,7 +4,11 @@
ARG_ENABLE("soap", "SOAP support", "no");
if (PHP_SOAP != "no") {
- if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('soap',
'libxml')) {
+ if (PHP_LIBXML == "yes" &&
+ ADD_EXTENSION_DEP('soap', 'libxml') &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_SOAP", PHP_PHP_BUILD +
"\\include\\libxml2") &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_SOAP", PHP_PHP_BUILD +
"\\include\\libxml2")
+ ) {
EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c
php_sdl.c php_xml.c', null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support");
diff --git a/ext/wddx/config.w32 b/ext/wddx/config.w32
index 323c430..a34c36e 100644
--- a/ext/wddx/config.w32
+++ b/ext/wddx/config.w32
@@ -3,7 +3,10 @@
ARG_WITH("wddx", "WDDX support", "yes");
-if (PHP_WDDX == "yes" && PHP_LIBXML == "yes") {
+if (PHP_WDDX == "yes" &&
+ PHP_LIBXML == "yes" &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_WDDX", PHP_PHP_BUILD +
"\\include\\libxml2")
+) {
EXTENSION("wddx", "wddx.c");
AC_DEFINE("HAVE_WDDX", 1, "WDDX support");
diff --git a/ext/xml/config.w32 b/ext/xml/config.w32
index 20b5c8d..54e5fc2 100644
--- a/ext/xml/config.w32
+++ b/ext/xml/config..w32
@@ -4,8 +4,11 @@
ARG_WITH("xml", "XML support", "yes");
if (PHP_XML == "yes") {
- if (PHP_LIBXML == "yes"
- && ADD_EXTENSION_DEP('xml', 'libxml')) {
+ if (PHP_LIBXML == "yes" &&
+ ADD_EXTENSION_DEP('xml', 'libxml') &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_XML", PHP_PHP_BUILD +
"\\include\\libxml2") &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_XML", PHP_PHP_BUILD +
"\\include\\libxml2")
+ ) {
EXTENSION("xml", "xml.c compat.c", null,
"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
AC_DEFINE("HAVE_XML", 1, "XML support");
if (!PHP_XML_SHARED) {
diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32
index 060a0cb..cca068a 100644
--- a/ext/xmlreader/config.w32
+++ b/ext/xmlreader/config.w32
@@ -3,7 +3,11 @@
ARG_ENABLE("xmlreader", "XMLReader support", "yes");
-if (PHP_XMLREADER == "yes" && PHP_LIBXML == "yes") {
+if (PHP_XMLREADER == "yes" &&
+ PHP_LIBXML == "yes" &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_XMLREADER", PHP_PHP_BUILD
+ "\\include\\libxml2") &&
+ CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_XMLREADER", PHP_PHP_BUILD +
"\\include\\libxml2")
+ ) {
EXTENSION("xmlreader", "php_xmlreader.c");
AC_DEFINE("HAVE_XMLREADER", 1, "XMLReader support");
if (!PHP_XMLREADER_SHARED) {
diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32
index 58e7d9f..35fbf26 100644
--- a/ext/xmlrpc/config.w32
+++ b/ext/xmlrpc/config.w32
@@ -5,7 +5,8 @@ ARG_WITH("xmlrpc", "XMLRPC-EPI support", "no");
if (PHP_XMLRPC != "no") {
if (CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC",
configure_module_dirname + "/libxmlrpc")
- && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS")
+ && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_XMLRPC")
+ && CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS_XMLRPC",
PHP_PHP_BUILD + "\\include\\libxml2")
&& ADD_EXTENSION_DEP('xmlrpc', 'libxml')
&& ADD_EXTENSION_DEP('xmlrpc', 'xml')) {
EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");