[project @ 1999-11-04 15:09:09 by sewardj]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 9ae6449..85523c6 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.43 1999/07/14 13:26:48 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.45 1999/11/04 15:09:09 sewardj Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -137,7 +137,7 @@ dnl
 dnl Check for Happy and version.
 dnl
 AC_DEFUN(FPTOOLS_HAPPY,
-[AC_PATH_PROG(HappyCmd,happy,,$PATH ${hardtop}/happy/src)
+[AC_PATH_PROG(HappyCmd,happy,,$PATH:${hardtop}/happy/src)
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 [if test x"$HappyCmd" != x; then
    fptools_cv_happy_version="`$HappyCmd -v |
@@ -147,10 +147,12 @@ changequote([, ])dnl
 else
    fptools_cv_happy_version="";
 fi;
-if expr "$fptools_cv_happy_version" "<" 1.4 > /dev/null 2>&1; then
-   echo
-   echo "Happy version 1.4 or later is required to compile GHC."
-   exit 1;
+if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then
+   if test -d ghc; then
+     echo
+     echo "Happy version 1.6 or later is required to compile GHC."
+     exit 1;
+   fi
 fi;
 ])
 HappyVersion=$ac_cv_happy_version;