[xmlsec] tweak win makefiles

[Aleksey Sanin <aleksey src gnome org>]

commit 15dd15d7f9528a4a7f12bec327007385546b83e8
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Thu Apr 29 07:01:18 2010 -0700

    tweak win makefiles

 win32/configure.js |   16 ++++++++--------
 win32/mycfg.bat    |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/win32/configure.js b/win32/configure.js
index 6b6294f..c5551f1 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -45,7 +45,7 @@ var withNss = 0;
 var withMSCrypto = 0;
 var withLibXSLT = 1;
 var withIconv = 1;
-var withNT4 = 0;
+var withNT4 = 1;
 
 /* Win32 build options. */
 var buildUnicode = 1;
@@ -159,7 +159,7 @@ function discoverVersion()
 	vf.WriteLine("WITH_CRYPTO=" + withCrypto);	
 	vf.WriteLine("WITH_DEFAULT_CRYPTO=" + withDefaultCrypto);	
 	vf.WriteLine("WITH_OPENSSL=" + withOpenSSL);	
-	vf.WriteLine("WITH_OPENSSL_VERSION=" + withOpenSSLVersion);	
+	vf.WriteLine("WITH_OPENSSL_VERSION=XMLSEC_OPENSSL_" + withOpenSSLVersion);	
 	vf.WriteLine("WITH_NSS=" + withNss);	
 	vf.WriteLine("WITH_MSCRYPTO=" + withMSCrypto);	
 	vf.WriteLine("WITH_LIBXSLT=" + (withLibXSLT ? "1" : "0"));
@@ -311,19 +311,19 @@ for (j = 0; j < crlist.length; j++) {
 	if (crlist[j] == "openssl") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "XMLSEC_OPENSSL_098"; /* default */
+		withOpenSSLVersion = "098"; /* default */
 	} else if (crlist[j] == "openssl=096") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "XMLSEC_OPENSSL_096";
+		withOpenSSLVersion = "096";
 	} else if (crlist[j] == "openssl=097") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "XMLSEC_OPENSSL_097";
+		withOpenSSLVersion = "097";
 	} else if (crlist[j] == "openssl=098") {
 		curcrypto="openssl";
 		withOpenSSL = 1;
-		withOpenSSLVersion = "XMLSEC_OPENSSL_098";
+		withOpenSSLVersion = "098";
 	} else if (crlist[j] == "nss") {
 		curcrypto="nss";
 		withNss = 1;
@@ -369,8 +369,8 @@ var txtOut = "\nXMLSEC configuration\n";
 txtOut += "----------------------------\n";
 txtOut += "         Use Crypto: " + withCrypto + "\n";
 txtOut += " Use Default Crypto: " + withDefaultCrypto + "\n";
-txtOut += "       Use OpenSSL: " + boolToStr(withOpenSSL) + "\n";
-txtOut += "Use OpenSSL Version: " + boolToStr(withOpenSSLVersion) + "\n";
+txtOut += "        Use OpenSSL: " + boolToStr(withOpenSSL) + "\n";
+txtOut += "Use OpenSSL Version: " + withOpenSSLVersion + "\n";
 txtOut += "            Use NSS: " + boolToStr(withNss) + "\n";
 txtOut += "       Use MSCrypto: " + boolToStr(withMSCrypto) + "\n";
 txtOut += "        Use LibXSLT: " + boolToStr(withLibXSLT) + "\n";
diff --git a/win32/mycfg.bat b/win32/mycfg.bat
index 66af38e..9af468e 100644
--- a/win32/mycfg.bat
+++ b/win32/mycfg.bat
@@ -11,7 +11,7 @@ REM
 SET PREFIX=C:\cygwin\home\local
 SET XMLSEC_INCLUDE=%PREFIX%\include;%PREFIX%\include\mozilla;%PREFIX%\include\mozilla\nspr;%PREFIX%\include\mozilla\nss;%MSSDK_INCLUDE%
 SET XMLSEC_LIB=%PREFIX%\lib;%MSSDK_LIB%
-SET XMLSEC_OPTIONS=static=no iconv=no nt4=yes debug=yes xslt=yes crypto=mscrypto unicode=yes
+SET XMLSEC_OPTIONS=static=no iconv=no debug=yes xslt=yes crypto=mscrypto,openssl unicode=yes
 
 del /F Makefile configure.txt
 cscript configure.js prefix=%PREFIX% %XMLSEC_OPTIONS% include=%XMLSEC_INCLUDE% lib=%XMLSEC_LIB%