Commit 307c2b62 authored by michaelw's avatar michaelw

[project @ 2001-04-20 10:56:12 by michaelw]

* print the happy version, even if the following test fails...
* also, do the test, even if the version is already in config.cache

*** MERGE with ghc-5-00 ***
(the latest configure.in commits should probably be merged, too...)
parent cc3e39d1
dnl $Id: aclocal.m4,v 1.70 2001/04/17 21:41:29 michaelw Exp $
dnl $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
......@@ -207,11 +207,11 @@ else
fptools_cv_happy_version="";
fi;
changequote([, ])dnl
])
if test -d $srcdir/ghc; 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;
])
fi
HappyVersion=$fptools_cv_happy_version;
AC_SUBST(HappyVersion)
])
......@@ -889,7 +889,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.70 2001/04/17 21:41:29 michaelw Exp $
dnl @version 0.01 $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $
dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
# FPTOOLS_CHECK_LIBM - check for math library
......@@ -977,7 +977,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.70 2001/04/17 21:41:29 michaelw Exp $
dnl @version 0.01 $Id: aclocal.m4,v 1.71 2001/04/20 10:56:12 michaelw Exp $
dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
AC_DEFUN(FPTOOLS_HAVE_OPENGL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment