set of Win32 patches for 2.6.0 by Joachim Bauch Daniel

* win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc
  win32/configure.js: set of Win32 patches for 2.6.0 by Joachim Bauch
Daniel

5 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c71dce7..6f92e934 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 21 11:26:36 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc
+	  win32/configure.js: set of Win32 patches for 2.6.0 by Joachim Bauch
+
 Tue Oct 21 02:07:22 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* tree.c: last minute patch from Eric Zurcher making it into 2.6.0
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index 9fb8aac8..6b4bdccf 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -148,6 +148,7 @@ LDFLAGS = $(LDFLAGS)
 # Libxml object files.
 XML_OBJS = $(XML_INTDIR)\c14n.obj\
 	$(XML_INTDIR)\catalog.obj\
+	$(XML_INTDIR)\chvalid.obj\
 	$(XML_INTDIR)\debugXML.obj\
 	$(XML_INTDIR)\dict.obj\
 	$(XML_INTDIR)\DOCBparser.obj\
@@ -186,6 +187,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\
 # Static libxml object files.
 XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
 	$(XML_INTDIR_A)\catalog.obj\
+	$(XML_INTDIR_A)\chvalid.obj\
 	$(XML_INTDIR_A)\debugXML.obj\
 	$(XML_INTDIR_A)\dict.obj\
 	$(XML_INTDIR_A)\DOCBparser.obj\
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index c5abb9f2..35ce9672 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -138,6 +138,7 @@ endif
 # Libxml object files.
 XML_OBJS = $(XML_INTDIR)/c14n.o\
 	$(XML_INTDIR)/catalog.o\
+	$(XML_INTDIR)/chvalid.obj\
 	$(XML_INTDIR)/debugXML.o\
 	$(XML_INTDIR)/dict.o\
 	$(XML_INTDIR)/DOCBparser.o\
@@ -178,6 +179,7 @@ XML_SRCS = $(subst .o,.c,$(subst $(XML_INTDIR)/,$(XML_SRCDIR)/,$(XML_OBJS)))
 # Static libxml object files.
 XML_OBJS_A = $(XML_INTDIR_A)/c14n.o\
 	$(XML_INTDIR_A)/catalog.o\
+	$(XML_INTDIR_A)/chvalid.obj\
 	$(XML_INTDIR_A)/debugXML.o\
 	$(XML_INTDIR_A)/dict.o\
 	$(XML_INTDIR_A)/DOCBparser.o\
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index b2689bfd..1fd3d862 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -127,6 +127,7 @@ LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
 # Libxml object files.
 XML_OBJS = $(XML_INTDIR)\c14n.obj\
 	$(XML_INTDIR)\catalog.obj\
+	$(XML_INTDIR)\chvalid.obj\
 	$(XML_INTDIR)\debugXML.obj\
 	$(XML_INTDIR)\dict.obj\
 	$(XML_INTDIR)\DOCBparser.obj\
@@ -165,6 +166,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\
 # Static libxml object files.
 XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
 	$(XML_INTDIR_A)\catalog.obj\
+	$(XML_INTDIR_A)\chvalid.obj\
 	$(XML_INTDIR_A)\debugXML.obj\
 	$(XML_INTDIR_A)\dict.obj\
 	$(XML_INTDIR_A)\DOCBparser.obj\
diff --git a/win32/configure.js b/win32/configure.js
index 3735aa02..2d434c73 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -47,6 +47,7 @@ var withSchemas = true;
 var withRegExps = true;
 var withTree = true;
 var withReader = true;
+var withWriter = true;
 var withWalker = true;
 var withPush = true;
 var withValid = true;
@@ -122,6 +123,7 @@ function usage()
 	txt += "  regexps:    Enable regular expressions (" + (withRegExps? "yes" : "no") + ")\n";
 	txt += "  tree:       Enable tree api (" + (withTree? "yes" : "no") + ")\n";
 	txt += "  reader:     Enable xmlReader api (" + (withReader? "yes" : "no") + ")\n";
+	txt += "  writer:     Enable xmlWriter api (" + (withWriter? "yes" : "no") + ")\n";
 	txt += "  walker:     Enable xmlDocWalker api (" + (withWalker? "yes" : "no") + ")\n";
 	txt += "  push:       Enable push api (" + (withPush? "yes" : "no") + ")\n";
 	txt += "  valid:      Enable DTD validation support (" + (withValid? "yes" : "no") + ")\n";
@@ -209,6 +211,7 @@ function discoverVersion()
 	vf.WriteLine("WITH_REGEXPS=" + (withRegExps? "1" : "0"));
 	vf.WriteLine("WITH_TREE=" + (withTree? "1" : "0"));
 	vf.WriteLine("WITH_READER=" + (withReader? "1" : "0"));
+	vf.WriteLine("WITH_WRITER=" + (withWriter? "1" : "0"));
 	vf.WriteLine("WITH_WALKER=" + (withWalker? "1" : "0"));
 	vf.WriteLine("WITH_PUSH=" + (withPush? "1" : "0"));
 	vf.WriteLine("WITH_VALID=" + (withValid? "1" : "0"));
@@ -293,6 +296,8 @@ function configureLibxml()
 			of.WriteLine(s.replace(/\@WITH_TREE\@/, withTree? "1" : "0"));
 		} else if (s.search(/\@WITH_READER\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_READER\@/, withReader? "1" : "0"));
+		} else if (s.search(/\@WITH_WRITER\@/) != -1) {
+			of.WriteLine(s.replace(/\@WITH_WRITER\@/, withWriter? "1" : "0"));
 		} else if (s.search(/\@WITH_WALKER\@/) != -1) {
 			of.WriteLine(s.replace(/\@WITH_WALKER\@/, withWalker? "1" : "0"));
 		} else if (s.search(/\@WITH_PUSH\@/) != -1) {
@@ -444,6 +449,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
 			withTree = strToBool(arg.substring(opt.length + 1, arg.length));
 		else if (opt == "reader")
 			withReader = strToBool(arg.substring(opt.length + 1, arg.length));
+		else if (opt == "writer")
+			withWriter = strToBool(arg.substring(opt.length + 1, arg.length));
 		else if (opt == "walker")
 			withWalker = strToBool(arg.substring(opt.length + 1, arg.length));
 		else if (opt == "push")
@@ -579,6 +586,7 @@ txtOut += "  Memory debugging: " + boolToStr(withMemDebug) + "\n";
 txtOut += "    Regexp support: " + boolToStr(withRegExps) + "\n";
 txtOut += "      Tree support: " + boolToStr(withTree) + "\n";
 txtOut += "    Reader support: " + boolToStr(withReader) + "\n";
+txtOut += "    Writer support: " + boolToStr(withWriter) + "\n";
 txtOut += "    Walker support: " + boolToStr(withWalker) + "\n";
 txtOut += "      Push support: " + boolToStr(withPush) + "\n";
 txtOut += "Validation support: " + boolToStr(withValid) + "\n";