[project @ 2003-08-18 13:15:53 by panne]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 575782c..5572f93 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -101,9 +101,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
 # build the libs first if we're bootstrapping from .hc files
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock
+AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock alex
 else
-AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock
+AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock alex
 endif
 
 #
@@ -349,10 +349,17 @@ GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
 GL_CFLAGS=@GL_CFLAGS@
 GL_LIBS=@GL_LIBS@
+GLUT_LIBS=@GLUT_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
+
+# 
+# .NET interop support?
+#
+DotnetSupport=@DotnetSupport@
+
 ################################################################################
 #
 #              happy project
@@ -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@
@@ -682,11 +696,10 @@ HaveLibMingwEx    = @HaveLibMingwEx@
 HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 
 #-----------------------------------------------------------------------------
-# Regex libraries
+# Regex library
 # (if present in libc use that one, otherwise use the one in the tree)
 #
 HavePosixRegex  = @HavePosixRegex@
-HaveGNURegex   = @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+
@@ -864,6 +877,16 @@ HAPPY_VERSION              = @HappyVersion@
 GHC_HAPPY_OPTS         = -agc
 
 #
+# Alex
+#
+ALEX                   = @AlexCmd@
+ALEX_VERSION           = @AlexVersion@         
+#
+# Options to pass to Happy when we're going to compile the output with GHC
+#
+GHC_ALEX_OPTS          = -g
+
+#
 # Haddock
 # 
 HADDOCK                        = @HaddockCmd@