cache the values of ghc_ge_XXX at configure-time

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a1c6a84..d1605d1 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -315,6 +315,9 @@ BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
 
 HscIfaceFileVersion=6
 
+# Building with debugger?
+GhciWithDebugger=YES
+
 #------------------------------------------------------------------------------
 # Options for Libraries
 
@@ -505,6 +508,7 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 # passing through, we might as well set them.
 
 prefix                 = @prefix@
+datarootdir            = @datarootdir@
 exec_prefix            = @exec_prefix@
 bindir                 = @bindir@
 datadir0               = @datadir@
@@ -829,11 +833,11 @@ GhcMajVersion     = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
 # Some useful GHC version predicates:
-ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
-ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
-ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
-ghc_ge_605 = $(shell if (test $(GhcCanonVersion) -ge 605); then echo YES; else echo NO; fi)
+ghc_ge_504 = @ghc_ge_504@
+ghc_ge_601 = @ghc_ge_601@
+ghc_ge_602 = @ghc_ge_602@
+ghc_ge_603 = @ghc_ge_603@
+ghc_ge_605 = @ghc_ge_605@
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version
@@ -878,6 +882,9 @@ endif
 HaveLibGmp     = @HaveLibGmp@
 LibGmp         = @LibGmp@
 
+GMP_INCLUDE_DIRS=@GMP_INCLUDE_DIRS@
+GMP_LIB_DIRS=@GMP_LIB_DIRS@
+
 #-----------------------------------------------------------------------------
 # GMP framework (Mac OS X)
 #