[project @ 2001-02-05 11:49:20 by chak]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 0f59610..a9d8e89 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.61 2001/01/08 12:58:45 chak 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
 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
 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
 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,11 @@ else
    fptools_cv_happy_version="";
 fi;
 changequote([, ])dnl
    fptools_cv_happy_version="";
 fi;
 changequote([, ])dnl

-if expr "$fptools_cv_happy_version" "<" 1.6 > /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
    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;
      exit 1;
    fi
 fi;

@@ -527,7 +528,7 @@ fi
 ])
 
 dnl ** Obtain the value of a C constant.
 ])
 
 dnl ** Obtain the value of a C constant.

-dnl    The value will be `0' if the constant is undefined.
+dnl    The value will be `(-1)' if the constant is undefined.

 dnl
 dnl    This is set up so that the argument can be a shell variable.
 dnl
 dnl
 dnl    This is set up so that the argument can be a shell variable.
 dnl

@@ -547,7 +548,7 @@ main()
   exit(0);
 }], 
 eval "$cv_name=`cat conftestval`",
   exit(0);
 }], 
 eval "$cv_name=`cat conftestval`",

-eval "$cv_name=0",
+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)
 ifelse([$2], , , eval "$cv_name=$2"))])dnl
 eval "fptools_check_cconst_result=`echo '$'{$cv_name}`"
 AC_MSG_RESULT($fptools_check_cconst_result)

@@ -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 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.61 2001/01/08 12:58:45 chak 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
 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 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.61 2001/01/08 12:58:45 chak 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,
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 AC_DEFUN(FPTOOLS_HAVE_OPENGL,