Makefile fixes for Widows from Joel Reed Daniel

* win32/configure.js: Makefile fixes for Widows from Joel Reed
Daniel

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c027002..dd044772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 28 01:00:56 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+	* win32/configure.js: Makefile fixes for Widows from Joel Reed
+
 Sat Jan 22 22:14:26 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* libxslt/pattern.c libxslt/preproc.c libxslt/templates.c
diff --git a/win32/configure.js b/win32/configure.js
index 8c6d0bac..5e95a603 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -112,6 +112,7 @@ function usage()
 	txt += "  cruntime:   C-runtime compiler option (only msvc) (" + cruntime + ")\n";
 	txt += "  debug:      Build unoptimised debug executables (" + (buildDebug? "yes" : "no")  + ")\n";
 	txt += "  static:     Link xsltproc statically to libxslt (" + (buildStatic? "yes" : "no")  + ")\n";
+	txt += "              Note: automatically enabled if cruntime is not /MD or /MDd\n";
 	txt += "  prefix:     Base directory for the installation (" + buildPrefix + ")\n";
 	txt += "  bindir:     Directory where xsltproc and friends should be installed\n";
 	txt += "              (" + buildBinPrefix + ")\n";
@@ -387,6 +388,14 @@ if (error != 0) {
 	usage();
 	WScript.Quit(error);
 }
+
+// if user choses to link the c-runtime library statically into libxslt
+// with /MT and friends, then we need to enable static linking for xsltproc
+if (cruntime == "/MT" || cruntime == "/MTd" ||
+		cruntime == "/ML" || cruntime == "/MLd") {
+	buildStatic = 1;
+}
+
 dirSep = "\\";
 //if (compiler == "mingw")
 //	dirSep = "/";