[project @ 2003-06-27 16:53:07 by stolz]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 575782c..0730759 100644 (file)
--- 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
@@ -536,7 +542,8 @@ endif
 #
 #      SRC_HC_OPTS += -O
 
-SRC_HC_OPTS += -H16m -O
+SRC_HC_OPTS += @CPPFLAGS@ @CFLAGS@ -H16m -O
+EXTRA_LD_OPTS+=        @LDFLAGS@
 
 # These flags make flex 8-bit
 SRC_FLEX_OPTS  += -8
@@ -619,8 +626,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@