diff options
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 1e628b1401..8a9fe63cb5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -866,13 +866,8 @@ changequote([, ])dnl ]) if test ! -f compiler/parser/Parser.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs then - 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 -if test ! -f compiler/parser/Parser.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs -then - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-gt],[1.18.11], - [AC_MSG_ERROR([Happy version 1.18.11 or earlier is required to compile GHC.])])[] + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19], + [AC_MSG_ERROR([Happy version 1.19 or later is required to compile GHC.])])[] fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) @@ -900,13 +895,8 @@ FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[3.0], [Alex3=YES],[Alex3=NO]) if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs then - FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.1.0], - [AC_MSG_ERROR([Alex version 2.1.0 or later is required to compile GHC.])])[] -fi -if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs -then - FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-gt],[3.0.5], - [AC_MSG_ERROR([Alex version 3.0.5 or earlier is required to compile GHC.])])[] + FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.0], + [AC_MSG_ERROR([Alex version 3.1.0 or later is required to compile GHC.])])[] fi if test ! -f utils/haddock/src/Haddock/Lex.hs then |