X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=7e201fa2e56a5218fd954750696a6f601cd632d5;hp=918aaba5cccb67f8bc1cd38485b0fb9f21c3ec5f;hb=64235b3c05a8326799b54d76bbae2165d61e09f7;hpb=d28c5d2fb3510802c02f2650097e5dbac9353d0a

diff --git a/aclocal.m4 b/aclocal.m4
index 918aaba..7e201fa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -307,7 +307,7 @@ else
 fi
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
-[if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then
+[if test x"$HappyCmd" = x"$SrcTreeHappyCmd" -a -e $srcdir/happy/mk/version.mk; then
    fptools_cv_happy_version=`grep '^ProjectVersion[ 	]*=' $srcdir/happy/mk/version.mk | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`;
 elif test x"$HappyCmd" != x; then
    fptools_cv_happy_version="`$HappyCmd -v |