diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2013-02-03 18:05:25 +0000 |
|---|---|---|
| committer | David Waern <waern@ubuntu.(none)> | 2013-03-10 09:49:46 -0700 |
| commit | a1cef22a4e8f98d71f774118a3b4b2dff9febd85 (patch) | |
| tree | 5b707c90ebfba739c48e4f4ba78eb50177a43835 /aclocal.m4 | |
| parent | 9f2644215e39eb9509da819f6f5d4d7f1984d386 (diff) | |
| download | haskell-a1cef22a4e8f98d71f774118a3b4b2dff9febd85.tar.gz | |
Fix construction of ALL_ALEX_OPTS and ALL_AS_OPTS
Signed-off-by: David Waern <david.waern@gmail.com>
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 69b40fccf1..e225030ddd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -863,7 +863,7 @@ AC_SUBST(HappyVersion) dnl dnl Check for Alex and version. If we're building GHC, then we need -dnl at least Alex version 2.0.1. +dnl at least Alex version 2.1.1. dnl AC_DEFUN([FPTOOLS_ALEX], [ @@ -879,12 +879,17 @@ else fi; changequote([, ])dnl ]) +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.])])[] - FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-ge],[3.0], - [Alex3=YES],[Alex3=NO]) +fi +if test ! -f utils/haddock/src/Haddock/Lex.hs +then + FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.0], + [AC_MSG_ERROR([Alex version 3.0 or later is required to compile Haddock.])])[] fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) |