X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=6bfc6282ad8d3fd5b101e56e32b25385ebc51b87;hb=e8b2fe5550ee87ee6d6dce1aaffa50558da6f8e3;hp=045dafe13d997b129c2283d68924bae04dffc1b0;hpb=a08aa16ae39b5fc2f4541e9fd33009a5288ba0ae;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 045dafe..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@
@@ -662,6 +675,9 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 SRC_CC_OPTS += -G0
 endif
 
+# Solaris2 strikes again.
+unix_SRC_HSC2HS_OPTS += @unix_SRC_HSC2HS_OPTS@
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #