diff options
| author | Ian Lynagh <igloo@earth.li> | 2006-09-06 19:54:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2006-09-06 19:54:15 +0000 |
| commit | b67039a74676cd3d8eab39d3e986b889e92338a5 (patch) | |
| tree | 6fb69e3845d5eccbad0df5fe4117cd0ec6161be2 /aclocal.m4 | |
| parent | 061d33c9923500d169570171947335053b63755f (diff) | |
| download | haskell-b67039a74676cd3d8eab39d3e986b889e92338a5.tar.gz | |
Don't fail on missing happy/alex if we don't need them
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 003caa3d97..d8023f67cf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -235,8 +235,11 @@ else fi; changequote([, ])dnl ]) -FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15], - [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]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.])])[]dnl +fi HappyVersion=$fptools_cv_happy_version; AC_SUBST(HappyVersion) ]) @@ -271,8 +274,11 @@ else fi; changequote([, ])dnl ]) -FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], - [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])[]dnl +if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs +then + FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.0], + [AC_MSG_ERROR([Alex version 2.0 or later is required to compile GHC.])])[]dnl +fi AlexVersion=$fptools_cv_alex_version; AC_SUBST(AlexVersion) ]) |