[project @ 2002-05-22 09:02:40 by simonmar]

We don't pass --old-ghc to Happy any more.  Also, wire $(HappyOpts) to
-agc in config.mk rather than passing it through from configure, since
it was always the same anyhow.

diff --git a/aclocal.m4 b/aclocal.m4
index 0fc26a8..8d3de51 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.101 2002/05/17 09:03:13 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.102 2002/05/22 09:02:40 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -220,24 +220,6 @@ if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
-
-# 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"
-
-# Soon version 1.13 will be required.  To give people a chance to
-# switch over (and me a chance to actually release 1.13 :-) , we have
-# a dummy copy of GlaExts in fptools/libraries/base. 
-#
-# If 1.13 actually is installed, we turn on the --old-ghc option for
-# the time being.
-
-FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-ge,[1.13],
-  [HappyOpts="--old-ghc -ac"])
-
-AC_SUBST(HappyOpts)
 ])
 
 dnl

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0367860..d2a1267 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -840,7 +840,7 @@ HAPPY_VERSION               = @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS         = @HappyOpts@
+GHC_HAPPY_OPTS         = -agc
 
 #
 # Stuff from fptools/literate