wez Fri Dec 5 16:16:48 2003 EDT
Modified files:
/php-src/ext/dom config.w32
/php-src/ext/libxml config.w32
/php-src/ext/simplexml config.w32
/php-src/ext/xml config.w32
/php-src/ext/xsl config.w32
Log:
Tweak xml related build.
Still some warnings for ext/xsl, but I'll leave that to someone else for now.
Index: php-src/ext/dom/config.w32
diff -u php-src/ext/dom/config.w32:1.1 php-src/ext/dom/config.w32:1.2
--- php-src/ext/dom/config.w32:1.1 Tue Dec 2 18:16:52 2003
+++ php-src/ext/dom/config.w32 Fri Dec 5 16:16:44 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:52 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:44 wez Exp $
// vim:ft=javascript
ARG_WITH("dom", "DOM support", "yes");
@@ -13,6 +13,9 @@
notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \
domlocator.c namednodemap.c userdatahandler.c");
AC_DEFINE("HAVE_DOM", 1, "DOM support");
+ if (!PHP_DOM_SHARED) {
+ ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC ");
+ }
}
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.5 php-src/ext/libxml/config.w32:1.6
--- php-src/ext/libxml/config.w32:1.5 Fri Dec 5 15:17:46 2003
+++ php-src/ext/libxml/config.w32 Fri Dec 5 16:16:45 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2003/12/05 20:17:46 wez Exp $
+// $Id: config.w32,v 1.6 2003/12/05 21:16:45 wez Exp $
// vim:ft=javascript
ARG_WITH("libxml", "LibXML support", "yes");
@@ -10,7 +10,8 @@
EXTENSION("libxml", "libxml.c", false /* never shared */);
AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
- ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED /D LIBXML_STATIC ");
+ ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED");
+ ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC ");
if (!PHP_LIBXML_SHARED) {
ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
}
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.1 php-src/ext/simplexml/config.w32:1.2
--- php-src/ext/simplexml/config.w32:1.1 Tue Dec 2 18:16:57 2003
+++ php-src/ext/simplexml/config.w32 Fri Dec 5 16:16:46 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:57 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
// vim:ft=javascript
ARG_WITH("simplexml", "Simple XML support", "yes");
@@ -6,6 +6,9 @@
if (PHP_SIMPLEXML == "yes" && PHP_LIBXML == "yes") {
EXTENSION("simplexml", "simplexml.c");
AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support");
+ if (!PHP_SIMPLEXML_SHARED) {
+ ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
+ }
}
Index: php-src/ext/xml/config.w32
diff -u php-src/ext/xml/config.w32:1.1 php-src/ext/xml/config.w32:1.2
--- php-src/ext/xml/config.w32:1.1 Tue Dec 2 18:17:00 2003
+++ php-src/ext/xml/config.w32 Fri Dec 5 16:16:46 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:17:00 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
// vim:ft=javascript
ARG_WITH("xml", "XML support", "yes");
@@ -6,6 +6,9 @@
if (PHP_XML == "yes" && PHP_LIBXML == "yes") {
EXTENSION("xml", "xml.c compat.c");
AC_DEFINE("HAVE_XML", 1, "XML support");
+ if (!PHP_XML_SHARED) {
+ ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC ");
+ }
}
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.4 php-src/ext/xsl/config.w32:1.5
--- php-src/ext/xsl/config.w32:1.4 Fri Dec 5 15:17:47 2003
+++ php-src/ext/xsl/config.w32 Fri Dec 5 16:16:47 2003
@@ -1,17 +1,25 @@
-// $Id: config.w32,v 1.4 2003/12/05 20:17:47 wez Exp $
+// $Id: config.w32,v 1.5 2003/12/05 21:16:47 wez Exp $
// vim: ft=javascript
ARG_WITH("xsl", "xsl support", "no");
if (PHP_XSL != "no") {
if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
- if (CHECK_LIB("libxslt_a.lib;libxslt.lib", "xsl", PHP_XSL) &&
- CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h",
"CFLAGS_XSL")) {
+ var ext_xsl_lib_found = false;
+
+ if (CHECK_LIB("libxslt_a.lib", "xsl", PHP_XSL)) {
+ ADD_FLAG("CFLAGS_XSL", "/D LIBXSL_STATIC ");
+ ext_xsl_lib_found = true;
+ } else if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL)) {
+ ext_xsl_lib_found = true;
+ }
+
+ if (ext_xsl_lib_found && CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h",
"CFLAGS_XSL")) {
EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
if (! PHP_XSL_SHARED) {
- ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+ ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS /D
LIBXML_STATIC");
}
} else {
WARNING("xsl not enabled; libraries and headers not found");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
