[project @ 2002-05-21 14:58:49 by wolfgang]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 3a79ef8..0fc26a8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.99 2002/04/10 09:41:16 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.101 2002/05/17 09:03:13 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -221,12 +221,21 @@ 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])
+# 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)
 ])