[project @ 2002-05-07 00:46:09 by sof]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 84daf87..e7dd241 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.98 2002/03/12 09:23:01 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.100 2002/05/05 17:03:54 panne Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -214,20 +214,17 @@ else
 fi;
 changequote([, ])dnl
 ])
-if test -d $srcdir/ghc; then
+if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then
   FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-lt,[1.9],
   [AC_MSG_ERROR([Happy version 1.9 or later is required to compile GHC.])])dnl
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
 
-# 1.9 and later is required, assume that we can use
-# the "-agc" options.
+# 1.9 and later is required, assume that we can use the
+# "-agc" options. NOTE: The Master of Happy-ness says:
+# "Don't use -s! (yet)"
 HappyOpts="-agc"
-
-FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-gt,[1.11],
-  [HappyOpts=-agcs])
-
 AC_SUBST(HappyOpts)
 ])