X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=b38227fda330d9d24f941334668413e53daaa611;hb=91c750cbd18e3d610b0db498ded38d5b3c5adfac;hp=eb7b0cacee016038e871f9ac8ff9d2242e9b5476;hpb=4d6959b1a60cc8b03c76346c9a7bddfd77f4f80a;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index eb7b0ca..b38227f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.86 2001/10/24 09:43:47 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.90 2001/12/13 09:23:23 sof Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -197,7 +197,11 @@ AC_DEFUN(FPTOOLS_HAPPY,
 if test -d $srcdir/happy; then
    SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
 fi
-AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
+if test x"$UseSrcTreeHappy" = xYES; then
+  HappyCmd=$SrcTreeHappyCmd
+else
+  AC_PATH_PROG(HappyCmd,happy,$SrcTreeHappyCmd)
+fi
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
 [if test x"$HappyCmd" = x"$SrcTreeHappyCmd"; then
@@ -216,6 +220,15 @@ if test -d $srcdir/ghc; then
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
+
+# 1.9 and later is required, assume that we can use
+# the "-agc" options.
+HappyOpts="-agc"
+
+FPTOOLS_PROG_CHECK_VERSION([$fptools_cv_happy_version],-gt,[1.11],
+  [HappyOpts=-agcs])
+
+AC_SUBST(HappyOpts)
 ])
 
 dnl
@@ -1030,7 +1043,7 @@ AC_DEFUN(FPTOOLS_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case "$host" in
-*-*-beos* | *-*-macosx*)
+*-*-beos*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)