| Index: third_party/libxml/src/win32/configure.js
|
| diff --git a/third_party/libxml/src/win32/configure.js b/third_party/libxml/src/win32/configure.js
|
| index 75def3fc96d243381d68553499f2f139f2214178..edd943a6fe3f5defcccaf94a5744198ff96a6358 100644
|
| --- a/third_party/libxml/src/win32/configure.js
|
| +++ b/third_party/libxml/src/win32/configure.js
|
| @@ -43,6 +43,7 @@ var withIconv = true;
|
| var withIcu = false;
|
| var withIso8859x = false;
|
| var withZlib = false;
|
| +var withLzma = false;
|
| var withDebug = true;
|
| var withMemDebug = false;
|
| var withRunDebug = false;
|
| @@ -128,6 +129,7 @@ function usage()
|
| txt += " icu: Enable icu support (" + (withIcu? "yes" : "no") + ")\n";
|
| txt += " iso8859x: Enable ISO8859X support (" + (withIso8859x? "yes" : "no") + ")\n";
|
| txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no") + ")\n";
|
| + txt += " lzma: Enable lzma support (" + (withLzma? "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 += " run_debug: Enable memory debugger (" + (withRunDebug? "yes" : "no") + ")\n";
|
| @@ -238,6 +240,7 @@ function discoverVersion()
|
| vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0"));
|
| vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0"));
|
| vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
|
| + vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0"));
|
| vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0"));
|
| vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
|
| vf.WriteLine("WITH_RUN_DEBUG=" + (withRunDebug? "1" : "0"));
|
| @@ -269,8 +272,8 @@ function discoverVersion()
|
| vf.WriteLine("CRUNTIME=" + cruntime);
|
| vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
|
| } else if (compiler == "mingw") {
|
| - vf.WriteLine("INCLUDE+=;" + buildInclude);
|
| - vf.WriteLine("LIB+=;" + buildLib);
|
| + vf.WriteLine("INCLUDE+= -I" + buildInclude);
|
| + vf.WriteLine("LIB+= -L" + buildLib);
|
| } else if (compiler == "bcb") {
|
| vf.WriteLine("INCLUDE=" + buildInclude);
|
| vf.WriteLine("LIB=" + buildLib);
|
| @@ -302,6 +305,8 @@ function configureLibxml()
|
| of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0"));
|
| } else if (s.search(/\@WITH_THREADS\@/) != -1) {
|
| of.WriteLine(s.replace(/\@WITH_THREADS\@/, withThreads == "no"? "0" : "1"));
|
| + } else if (s.search(/\@WITH_THREAD_ALLOC\@/) != -1) {
|
| + of.WriteLine(s.replace(/\@WITH_THREAD_ALLOC\@/, "0"));
|
| } else if (s.search(/\@WITH_FTP\@/) != -1) {
|
| of.WriteLine(s.replace(/\@WITH_FTP\@/, withFtp? "1" : "0"));
|
| } else if (s.search(/\@WITH_HTTP\@/) != -1) {
|
| @@ -328,6 +333,8 @@ function configureLibxml()
|
| of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0"));
|
| } else if (s.search(/\@WITH_ZLIB\@/) != -1) {
|
| of.WriteLine(s.replace(/\@WITH_ZLIB\@/, withZlib? "1" : "0"));
|
| + } else if (s.search(/\@WITH_LZMA\@/) != -1) {
|
| + of.WriteLine(s.replace(/\@WITH_LZMA\@/, withLzma? "1" : "0"));
|
| } else if (s.search(/\@WITH_DEBUG\@/) != -1) {
|
| of.WriteLine(s.replace(/\@WITH_DEBUG\@/, withDebug? "1" : "0"));
|
| } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) {
|
| @@ -473,6 +480,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
|
| withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length));
|
| else if (opt == "zlib")
|
| withZlib = strToBool(arg.substring(opt.length + 1, arg.length));
|
| + else if (opt == "lzma")
|
| + withLzma = strToBool(arg.substring(opt.length + 1, arg.length));
|
| else if (opt == "xml_debug")
|
| withDebug = strToBool(arg.substring(opt.length + 1, arg.length));
|
| else if (opt == "mem_debug")
|
| @@ -579,7 +588,7 @@ if (buildIncPrefix == "")
|
| if (buildLibPrefix == "")
|
| buildLibPrefix = "$(PREFIX)" + dirSep + "lib";
|
| if (buildSoPrefix == "")
|
| - buildSoPrefix = "$(PREFIX)" + dirSep + "lib";
|
| + buildSoPrefix = "$(PREFIX)" + dirSep + "bin";
|
|
|
| // Discover the version.
|
| discoverVersion();
|
| @@ -622,7 +631,7 @@ var new_makefile = ".\\Makefile";
|
| var f = fso.FileExists(new_makefile);
|
| if (f) {
|
| var t = fso.GetFile(new_makefile);
|
| - t.Attributes = 0;
|
| + t.Attributes =0;
|
| }
|
| fso.CopyFile(makefile, new_makefile, true);
|
| WScript.Echo("Created Makefile.");
|
| @@ -656,6 +665,7 @@ txtOut += " iconv support: " + boolToStr(withIconv) + "\n";
|
| txtOut += " icu support: " + boolToStr(withIcu) + "\n";
|
| txtOut += " iso8859x support: " + boolToStr(withIso8859x) + "\n";
|
| txtOut += " zlib support: " + boolToStr(withZlib) + "\n";
|
| +txtOut += " lzma support: " + boolToStr(withLzma) + "\n";
|
| txtOut += " Debugging module: " + boolToStr(withDebug) + "\n";
|
| txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n";
|
| txtOut += " Runtime debugging: " + boolToStr(withRunDebug) + "\n";
|
|
|