ghc_ge_607 is now always true

diff --git a/configure.ac b/configure.ac
index 218b641..69416b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,9 +160,7 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"

-  if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi

   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi

-  AC_SUBST(ghc_ge_607)dnl

   AC_SUBST(ghc_ge_609)dnl
 fi
 
   AC_SUBST(ghc_ge_609)dnl
 fi
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 71f6e17..800c32e 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -656,7 +656,6 @@ GhcPatchLevel       = @GhcPatchLevel@
 GhcMajVersion  = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
 GhcMajVersion  = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 

-ghc_ge_607 = @ghc_ge_607@

 ghc_ge_609 = @ghc_ge_609@
 
 # Canonicalised ghc version number, used for easy (integer) version
 ghc_ge_609 = @ghc_ge_609@
 
 # Canonicalised ghc version number, used for easy (integer) version

diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk
index cbd63f5..cc0aede 100644 (file)
--- a/utils/genapply/ghc.mk
+++ b/utils/genapply/ghc.mk
@@ -13,9 +13,7 @@
 utils/genapply_dist_MODULES = GenApply
 utils/genapply_dist_PROG    = $(GHC_GENAPPLY_PGM)
 
 utils/genapply_dist_MODULES = GenApply
 utils/genapply_dist_PROG    = $(GHC_GENAPPLY_PGM)
 

-ifeq "$(ghc_ge_607)" "YES"

 utils/genapply_HC_OPTS += -package pretty
 utils/genapply_HC_OPTS += -package pretty

-endif

 
 ifeq "$(GhcUnregisterised)" "YES"
 utils/genapply_HC_OPTS += -DNO_REGS
 
 ifeq "$(GhcUnregisterised)" "YES"
 utils/genapply_HC_OPTS += -DNO_REGS