From: Ian Lynagh <igloo@earth.li>
Date: Wed, 6 Sep 2006 19:54:15 +0000 (+0000)
Subject: Don't fail on missing happy/alex if we don't need them
X-Git-Tag: Before_FC_branch_merge~61
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=b67039a74676cd3d8eab39d3e986b889e92338a5;hp=061d33c9923500d169570171947335053b63755f

Don't fail on missing happy/alex if we don't need them
---

diff --git a/aclocal.m4 b/aclocal.m4
index 003caa3..d8023f6 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)
 ])