rrichards Tue Dec 4 17:14:02 2007 UTC
Modified files:
/php-src/ext/libxml config.w32
Log:
starting with 2.6.30, standard libxml2 build can be used
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.8 php-src/ext/libxml/config.w32:1.9
--- php-src/ext/libxml/config.w32:1.8 Fri Feb 25 22:59:26 2005
+++ php-src/ext/libxml/config.w32 Tue Dec 4 17:14:02 2007
@@ -1,16 +1,16 @@
-// $Id: config.w32,v 1.8 2005/02/25 22:59:26 fmk Exp $
+// $Id: config.w32,v 1.9 2007/12/04 17:14:02 rrichards Exp $
// vim:ft=javascript
ARG_WITH("libxml", "LibXML support", "yes");
if (PHP_LIBXML == "yes") {
- if (CHECK_LIB("libxml2_a.lib;libxml2.lib", "libxml") &&
+ if (CHECK_LIB("libxml2_a_dll.lib;libxml2_a.lib", "libxml") &&
CHECK_LIB("iconv_a.lib;iconv.lib", "libxml") &&
CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
EXTENSION("libxml", "libxml.c", false /* never shared */);
AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
- ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC ");
+ ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC /D
LIBXML_STATIC_FOR_DLL ");
if (!PHP_LIBXML_SHARED) {
ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
