Diff for /embedaddon/libxml2/win32/configure.js between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2013/07/22 01:22:29
Line 43  var withIconv = true; Line 43  var withIconv = true;
 var withIcu = false;  var withIcu = false;
 var withIso8859x = false;  var withIso8859x = false;
 var withZlib = false;  var withZlib = false;
   var withLzma = false;
 var withDebug = true;  var withDebug = true;
 var withMemDebug = false;  var withMemDebug = false;
 var withRunDebug = false;  var withRunDebug = false;
Line 128  function usage() Line 129  function usage()
         txt += "  icu:        Enable icu support (" + (withIcu? "yes" : "no")  + ")\n";          txt += "  icu:        Enable icu support (" + (withIcu? "yes" : "no")  + ")\n";
         txt += "  iso8859x:   Enable ISO8859X support (" + (withIso8859x? "yes" : "no")  + ")\n";          txt += "  iso8859x:   Enable ISO8859X support (" + (withIso8859x? "yes" : "no")  + ")\n";
         txt += "  zlib:       Enable zlib support (" + (withZlib? "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 += "  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 += "  run_debug:  Enable memory debugger (" + (withRunDebug? "yes" : "no")  + ")\n";          txt += "  run_debug:  Enable memory debugger (" + (withRunDebug? "yes" : "no")  + ")\n";
Line 238  function discoverVersion() Line 240  function discoverVersion()
         vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0"));          vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0"));
         vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0"));          vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0"));
         vf.WriteLine("WITH_ZLIB=" + (withZlib? "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_DEBUG=" + (withDebug? "1" : "0"));
         vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));          vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
         vf.WriteLine("WITH_RUN_DEBUG=" + (withRunDebug? "1" : "0"));          vf.WriteLine("WITH_RUN_DEBUG=" + (withRunDebug? "1" : "0"));
Line 269  function discoverVersion() Line 272  function discoverVersion()
                 vf.WriteLine("CRUNTIME=" + cruntime);                  vf.WriteLine("CRUNTIME=" + cruntime);
                 vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));                  vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
         } else if (compiler == "mingw") {          } else if (compiler == "mingw") {
                vf.WriteLine("INCLUDE+=;" + buildInclude);                vf.WriteLine("INCLUDE+= -I" + buildInclude);
                vf.WriteLine("LIB+=;" + buildLib);                vf.WriteLine("LIB+= -L" + buildLib);
         } else if (compiler == "bcb") {          } else if (compiler == "bcb") {
                 vf.WriteLine("INCLUDE=" + buildInclude);                  vf.WriteLine("INCLUDE=" + buildInclude);
                 vf.WriteLine("LIB=" + buildLib);                  vf.WriteLine("LIB=" + buildLib);
Line 328  function configureLibxml() Line 331  function configureLibxml()
                         of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0"));                          of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0"));
                 } else if (s.search(/\@WITH_ZLIB\@/) != -1) {                  } else if (s.search(/\@WITH_ZLIB\@/) != -1) {
                         of.WriteLine(s.replace(/\@WITH_ZLIB\@/, withZlib? "1" : "0"));                          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) {                  } 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) {
Line 473  for (i = 0; (i < WScript.Arguments.length) && (error = Line 478  for (i = 0; (i < WScript.Arguments.length) && (error =
                         withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length));                          withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length));
                 else if (opt == "zlib")                  else if (opt == "zlib")
                         withZlib = strToBool(arg.substring(opt.length + 1, arg.length));                          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")                  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")
Line 579  if (buildIncPrefix == "") Line 586  if (buildIncPrefix == "")
 if (buildLibPrefix == "")  if (buildLibPrefix == "")
         buildLibPrefix = "$(PREFIX)" + dirSep + "lib";          buildLibPrefix = "$(PREFIX)" + dirSep + "lib";
 if (buildSoPrefix == "")  if (buildSoPrefix == "")
        buildSoPrefix = "$(PREFIX)" + dirSep + "lib";        buildSoPrefix = "$(PREFIX)" + dirSep + "bin";
   
 // Discover the version.  // Discover the version.
 discoverVersion();  discoverVersion();
Line 656  txtOut += "     iconv support: " + boolToStr(withIconv Line 663  txtOut += "     iconv support: " + boolToStr(withIconv
 txtOut += "     icu   support: " + boolToStr(withIcu) + "\n";  txtOut += "     icu   support: " + boolToStr(withIcu) + "\n";
 txtOut += "  iso8859x support: " + boolToStr(withIso8859x) + "\n";  txtOut += "  iso8859x support: " + boolToStr(withIso8859x) + "\n";
 txtOut += "      zlib support: " + boolToStr(withZlib) + "\n";  txtOut += "      zlib support: " + boolToStr(withZlib) + "\n";
   txtOut += "      lzma support: " + boolToStr(withLzma) + "\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 += " Runtime debugging: " + boolToStr(withRunDebug) + "\n";  txtOut += " Runtime debugging: " + boolToStr(withRunDebug) + "\n";

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>