From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 19 Aug 2009 09:39:29 +0000 (+0000)
Subject: Bump Happy requirement from 1.15 to 1.16
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=2aea029422dc06f50aab82b35e5b3b0a42641ded

Bump Happy requirement from 1.15 to 1.16
Now that the haskell98 dependency of GHC has been removed, the
Happy-generated parsers must import Data.Array rather than Array, and
that change was made in Happy 1.16.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 10b94bf..d84cb99 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)