X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=6bfc6282ad8d3fd5b101e56e32b25385ebc51b87;hb=a7d8f43718b167689c0a4a4c23b33a325e0239f1;hp=575782c0f3ac9279775cb0f09bfe242315364f2f;hpb=95d086713865c41b3ff488d48b974f5109fd66a7;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 575782c..6bfc628 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -353,6 +353,12 @@ GL_LIBS=@GL_LIBS@
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
+
+# 
+# .NET interop support?
+#
+DotnetSupport=@DotnetSupport@
+
 ################################################################################
 #
 #		happy project
@@ -619,8 +625,15 @@ GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 GhcPatchLevel	= @GhcPatchLevel@
-# Canonicalised ghc version number, used for easy (integer) version comparisons.
+
+# Canonicalised ghc version number, used for easy (integer) version
+# comparisons.  We must expand $(GhcMinVersion) to two digits by
+# adding a leading zero if necessary:
+ifneq "$(findstring $(GhcMinVersion), 0 1 2 3 4 5 6 7 8 9)" ""
+GhcCanonVersion = $(GhcMajVersion)0$(GhcMinVersion)
+else
 GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
+endif
 
 HBC		= @HBC@
 NHC		= @NHC@