X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=bf88bd77da98277ea73cf83ed108950d42bd2845;hb=22b7fd79aeafa9a6b58f8448633197e00cec3962;hp=10b94bf6be204a1ae962c951e7f0d5d18721a0c6;hpb=644270783cbdea9beafab3886afdf7807b8a23b0;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 10b94bf..bf88bd7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -246,8 +246,8 @@ changequote([, ])dnl
 ])
 if test ! -f compiler/parser/Parser.hs || test ! -f compiler/main/ParsePkgConf.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs
 then
-    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15],
-      [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]
+    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.16],
+      [AC_MSG_ERROR([Happy version 1.16 or later is required to compile GHC.])])[]
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
@@ -558,6 +558,7 @@ fi
 if test "$fp_have_gcc" = "NO" -a -d $srcdir/ghc; then
   AC_MSG_ERROR([gcc is required])
 fi
+GccLT34=
 AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version],
 [if test "$fp_have_gcc" = "YES"; then
    fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`"
@@ -566,12 +567,14 @@ AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version],
    # See #2770: gcc 2.95 doesn't work any more, apparently.  There probably
    # isn't a very good reason for that, but for now just make configure
    # fail.
+   FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.4], GccLT34=YES)
  else
    fp_cv_gcc_version="not-installed"
  fi
 ])
 AC_SUBST([HaveGcc], [$fp_have_gcc])
 AC_SUBST([GccVersion], [$fp_cv_gcc_version])
+AC_SUBST(GccLT34)
 ])# FP_HAVE_GCC
 
 AC_DEFUN([FP_MINGW_GCC],