X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=ce9e04b34e5b75cddaaac75c0002b31195ffb38f;hb=d0ea71ec5000050ec22487029a9fcf6da76ee422;hp=ac9835ae41a416d5b1fa9fb4492c6a2d516d6ff7;hpb=d2fdf91ce20bc64a4d486df8d195b6b05b000db9;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index ac9835a..ce9e04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,8 @@ if test ! -f mk/config.h.in; then
    exit 1
 fi
 
+AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
+
 FP_SETUP_PROJECT_VERSION
 
 # Hmmm, we fix the RPM release number to 1 here... Is this convenient?
@@ -710,16 +712,16 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
-  if test $GhcCanonVersion -ge 504; then ghc_ge_504=YES; else ghc_ge_504=NO; fi
   if test $GhcCanonVersion -ge 601; then ghc_ge_601=YES; else ghc_ge_601=NO; fi
   if test $GhcCanonVersion -ge 602; then ghc_ge_602=YES; else ghc_ge_602=NO; fi
   if test $GhcCanonVersion -ge 603; then ghc_ge_603=YES; else ghc_ge_603=NO; fi
   if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
-  AC_SUBST(ghc_ge_504)dnl
+  if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
   AC_SUBST(ghc_ge_601)dnl
   AC_SUBST(ghc_ge_602)dnl
   AC_SUBST(ghc_ge_603)dnl
   AC_SUBST(ghc_ge_605)dnl
+  AC_SUBST(ghc_ge_607)dnl
 fi
 
 # Check whether this GHC has readline installed