From fb2442c0498868330476f5fdde46339eab68e72d Mon Sep 17 00:00:00 2001 From: sewardj Date: Thu, 18 Jan 2001 12:27:42 +0000 Subject: [PATCH] [project @ 2001-01-18 12:27:42 by sewardj] Require happy-1.9 now. --- aclocal.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index cb247dc..78acbcb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.64 2001/01/16 06:02:29 qrczak Exp $ +dnl $Id: aclocal.m4,v 1.65 2001/01/18 12:27:42 sewardj Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -154,7 +154,7 @@ esac dnl dnl Check for Happy and version. If we're building GHC, then we need -dnl at least Happy version 1.6. If there's no installed Happy, we look +dnl at least Happy version 1.9. If there's no installed Happy, we look dnl for a happy source tree and point the build system at that instead. dnl dnl ToDo: when we reset HappyCmd to the source tree, autoconf doesn't @@ -175,10 +175,10 @@ else fptools_cv_happy_version=""; fi; changequote([, ])dnl -if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then +if expr "$fptools_cv_happy_version" "<" 1.9 > /dev/null 2>&1; then if test -d $srcdir/ghc; then echo - echo "Happy version 1.6 or later is required to compile GHC." + echo "Happy version 1.9 or later is required to compile GHC." exit 1; fi fi; @@ -860,7 +860,7 @@ dnl The variable LIBM (which is not an output variable by default) is dnl set to a value which is suitable for use in a Makefile (for example, dnl in make's LOADLIBES macro) provided you AC_SUBST it first. dnl -dnl @version 0.01 $Id: aclocal.m4,v 1.64 2001/01/16 06:02:29 qrczak Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.65 2001/01/18 12:27:42 sewardj Exp $ dnl @author Matthew D. Langston # FPTOOLS_CHECK_LIBM - check for math library @@ -948,7 +948,7 @@ dnl Please note that as the ac_opengl macro and the toy example evolves, dnl the version number increases, so you may have to adjust the above dnl URL accordingly. dnl -dnl @version 0.01 $Id: aclocal.m4,v 1.64 2001/01/16 06:02:29 qrczak Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.65 2001/01/18 12:27:42 sewardj Exp $ dnl @author Matthew D. Langston AC_DEFUN(FPTOOLS_HAVE_OPENGL, -- 1.7.10.4