diff options
| author | simonmar <unknown> | 2001-01-30 11:13:26 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2001-01-30 11:13:26 +0000 |
| commit | 52292ac64999e617822294d70cb51e58f86085a0 (patch) | |
| tree | 9811891f9685bf2279ddcf6d8687df50d614869c | |
| parent | 5e5858bf97e28ab8e9c8fc4361890e41bd6f1d6b (diff) | |
| download | haskell-52292ac64999e617822294d70cb51e58f86085a0.tar.gz | |
[project @ 2001-01-30 11:13:26 by simonmar]
Add Sigbjorn's hack to fix the Happy version test.
| -rw-r--r-- | aclocal.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 78acbcb671..a9d8e89fd0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.65 2001/01/18 12:27:42 sewardj Exp $ +dnl $Id: aclocal.m4,v 1.66 2001/01/30 11:13:26 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -175,7 +175,8 @@ else fptools_cv_happy_version=""; fi; changequote([, ])dnl -if expr "$fptools_cv_happy_version" "<" 1.9 > /dev/null 2>&1; then +if ( test `echo "$fptools_cv_happy_version" | sed -e "s/\(.*\)\..*/\1/g"` "-eq" "1" && + test `echo "$fptools_cv_happy_version" | sed -e "s/.*\.\(.*\)/\1/g"` "-lt" "9" ); then if test -d $srcdir/ghc; then echo echo "Happy version 1.9 or later is required to compile GHC." @@ -860,7 +861,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.65 2001/01/18 12:27:42 sewardj Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.66 2001/01/30 11:13:26 simonmar Exp $ dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU> # FPTOOLS_CHECK_LIBM - check for math library @@ -948,7 +949,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.65 2001/01/18 12:27:42 sewardj Exp $ +dnl @version 0.01 $Id: aclocal.m4,v 1.66 2001/01/30 11:13:26 simonmar Exp $ dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU> AC_DEFUN(FPTOOLS_HAVE_OPENGL, |