lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

applied zlib patch

Browse Source
This commit is contained in:
Igor Zlatkovic
2002-09-20 16:40:17 +00:00
parent 9a4efcb911
commit 3acadf4128
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win32/Makefile.msvc
View File

@@ -36,6 +36,7 @@ AUTOCONF = .\configure.txt
#WITH_XPTR = 1 #WITH_XPTR = 1
#WITH_XINCLUDE = 1 #WITH_XINCLUDE = 1
#WITH_ICONV = 1 #WITH_ICONV = 1
#WITH_ZLIB = 0
#WITH_DEBUG = 1 #WITH_DEBUG = 1
#WITH_MEM_DEBUG = 0 #WITH_MEM_DEBUG = 0
#WITH_SCHEMAS = 1 #WITH_SCHEMAS = 1
@@ -80,6 +81,9 @@ CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
!if "$(WITH_THREADS)" == "1" !if "$(WITH_THREADS)" == "1"
CFLAGS = $(CFLAGS) /D "_REENTRANT" CFLAGS = $(CFLAGS) /D "_REENTRANT"
!endif !endif
!if "$(WITH_ZLIB)" == "1"
CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"
!endif
# The linker and its options. # The linker and its options.
LD = link.exe LD = link.exe
@@ -96,6 +100,9 @@ LIBS = $(LIBS) iconv_a.lib
LIBS = $(LIBS) iconv.lib LIBS = $(LIBS) iconv.lib
!endif !endif
!endif !endif
!if "$(WITH_ZLIB)" == "1"
LIBS = $(LIBS) zlib.lib
!endif
# The archiver and its options. # The archiver and its options.
AR = lib.exe AR = lib.exe

12
win32/configure.js
View File

@@ -42,6 +42,7 @@ var withXpath = true;
var withXptr = true; var withXptr = true;
var withXinclude = true; var withXinclude = true;
var withIconv = true; var withIconv = true;
var withZlib = false;
var withDebug = true; var withDebug = true;
var withMemDebug = false; var withMemDebug = false;
var withSchemas = true; var withSchemas = true;
@@ -104,7 +105,8 @@ function usage()
txt += " xpath: Enable XPath support (" + (withXpath? "yes" : "no") + ")\n"; txt += " xpath: Enable XPath support (" + (withXpath? "yes" : "no") + ")\n";
txt += " xptr: Enable XPointer support (" + (withXptr? "yes" : "no") + ")\n"; txt += " xptr: Enable XPointer support (" + (withXptr? "yes" : "no") + ")\n";
txt += " xinclude: Enable XInclude support (" + (withXinclude? "yes" : "no") + ")\n"; txt += " xinclude: Enable XInclude support (" + (withXinclude? "yes" : "no") + ")\n";
txt += " iconv: Enable ICONV support (" + (withIconv? "yes" : "no") + ")\n"; txt += " iconv: Enable iconv support (" + (withIconv? "yes" : "no") + ")\n";
txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no") + ")\n";
txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n"; txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n";
txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n"; txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n";
txt += " regexps: Enable regular expressions (" + (withRegExps? "yes" : "no") + ")\n"; txt += " regexps: Enable regular expressions (" + (withRegExps? "yes" : "no") + ")\n";
@@ -170,6 +172,7 @@ function discoverVersion()
vf.WriteLine("WITH_XPTR=" + (withXptr? "1" : "0")); vf.WriteLine("WITH_XPTR=" + (withXptr? "1" : "0"));
vf.WriteLine("WITH_XINCLUDE=" + (withXinclude? "1" : "0")); vf.WriteLine("WITH_XINCLUDE=" + (withXinclude? "1" : "0"));
vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0")); vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0"));
vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
vf.WriteLine("WITH_SCHEMAS=" + (withSchemas? "1" : "0")); vf.WriteLine("WITH_SCHEMAS=" + (withSchemas? "1" : "0"));
@@ -227,6 +230,8 @@ function configureLibxml()
of.WriteLine(s.replace(/\@WITH_XINCLUDE\@/, withXinclude? "1" : "0")); of.WriteLine(s.replace(/\@WITH_XINCLUDE\@/, withXinclude? "1" : "0"));
} else if (s.search(/\@WITH_ICONV\@/) != -1) { } else if (s.search(/\@WITH_ICONV\@/) != -1) {
of.WriteLine(s.replace(/\@WITH_ICONV\@/, withIconv? "1" : "0")); of.WriteLine(s.replace(/\@WITH_ICONV\@/, withIconv? "1" : "0"));
} else if (s.search(/\@WITH_ZLIB\@/) != -1) {
of.WriteLine(s.replace(/\@WITH_ZLIB\@/, withZlib? "1" : "0"));
} else if (s.search(/\@WITH_DEBUG\@/) != -1) { } else if (s.search(/\@WITH_DEBUG\@/) != -1) {
of.WriteLine(s.replace(/\@WITH_DEBUG\@/, withDebug? "1" : "0")); of.WriteLine(s.replace(/\@WITH_DEBUG\@/, withDebug? "1" : "0"));
} else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) { } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) {
@@ -333,6 +338,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
withXinclude = strToBool(arg.substring(opt.length + 1, arg.length)); withXinclude = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "iconv") else if (opt == "iconv")
withIconv = strToBool(arg.substring(opt.length + 1, arg.length)); withIconv = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "zlib")
withZlib = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "xml_debug") else if (opt == "xml_debug")
withDebug = strToBool(arg.substring(opt.length + 1, arg.length)); withDebug = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "mem_debug") else if (opt == "mem_debug")
@@ -417,7 +424,8 @@ txtOut += " DocBook support: " + boolToStr(withDocb) + "\n";
txtOut += " XPath support: " + boolToStr(withXpath) + "\n"; txtOut += " XPath support: " + boolToStr(withXpath) + "\n";
txtOut += " XPointer support: " + boolToStr(withXptr) + "\n"; txtOut += " XPointer support: " + boolToStr(withXptr) + "\n";
txtOut += " XInclude support: " + boolToStr(withXinclude) + "\n"; txtOut += " XInclude support: " + boolToStr(withXinclude) + "\n";
txtOut += " ICONV support: " + boolToStr(withIconv) + "\n"; txtOut += " iconv support: " + boolToStr(withIconv) + "\n";
txtOut += " zlib support: " + boolToStr(withZlib) + "\n";
txtOut += " Debugging module: " + boolToStr(withDebug) + "\n"; txtOut += " Debugging module: " + boolToStr(withDebug) + "\n";
txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n";
txtOut += " Regexp support: " + boolToStr(withRegExps) + "\n"; txtOut += " Regexp support: " + boolToStr(withRegExps) + "\n";