X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=9bccc01ad75c14a285fd9a3a24555180fed36387;hb=4d75153372c1f3c1cfc1cb555cf86c91d07a36c6;hp=245c48aa7533a8f6ca9c34067f954028c0b7c8e0;hpb=b63b06bb5d1adae40eae0aecb7edec077876d1ed;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 245c48a..9bccc01 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,4 @@
-dnl $Id: aclocal.m4,v 1.63 2001/01/15 22:24:54 lewie Exp $
-dnl do not read me
+dnl $Id: aclocal.m4,v 1.68 2001/03/13 14:59:56 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -155,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
@@ -176,10 +175,12 @@ else
    fptools_cv_happy_version="";
 fi;
 changequote([, ])dnl
-if expr "$fptools_cv_happy_version" "<" 1.6 > /dev/null 2>&1; then
-   if test -d $srcdir/ghc; then
+if test -d $srcdir/ghc; then
+  if ( test "$fptools_cv_happy_version" = "" || (
+       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
      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;
@@ -544,11 +545,11 @@ main()
 {
   FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
-  fprintf(f, "(%d)\n", $1);
+  fprintf(f, "%d\n", $1);
   exit(0);
 }], 
 eval "$cv_name=`cat conftestval`",
-eval "$cv_name='(-1)'",
+eval "$cv_name=-1",
 ifelse([$2], , , eval "$cv_name=$2"))])dnl
 eval "fptools_check_cconst_result=`echo '$'{$cv_name}`"
 AC_MSG_RESULT($fptools_check_cconst_result)
@@ -861,7 +862,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.63 2001/01/15 22:24:54 lewie Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.68 2001/03/13 14:59:56 simonmar Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 # FPTOOLS_CHECK_LIBM - check for math library
@@ -869,7 +870,7 @@ AC_DEFUN(FPTOOLS_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case "$host" in
-*-*-beos* | *-*-cygwin*)
+*-*-beos* | *-*-macosx*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -949,7 +950,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.63 2001/01/15 22:24:54 lewie Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.68 2001/03/13 14:59:56 simonmar Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 AC_DEFUN(FPTOOLS_HAVE_OPENGL,