[project @ 2000-12-22 12:21:35 by simonmar]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 1e3d66a..d8ff450 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.56 2000/09/10 17:39:26 panne Exp $
+dnl $Id: aclocal.m4,v 1.60 2000/11/19 18:32:56 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -341,11 +341,15 @@ AC_DEFUN(FPTOOLS_CHECK_PERL_VERSION,
 if grep "version 5" conftest.out >/dev/null 2>&1; then
    :
 else
-   if grep "version 6" conftest.out >/dev/null 2>&1; then
-      :
-   else
-     echo "Your version of perl probably won't work."
-   fi
+  if grep "v5.6" conftest.out >/dev/null 2>&1; then
+     :
+  else
+     if grep "version 6" conftest.out >/dev/null 2>&1; then
+       :
+     else
+       echo "Your version of perl probably won't work."
+     fi
+  fi
 fi
 rm -fr conftest*
 ])
@@ -361,11 +365,11 @@ dnl
 AC_DEFUN(FPTOOLS_GHC_VERSION,
 [define([FPTOOLS_CV_GHC_VERSION], [fptools_cv_ghc_version])dnl
 AC_CACHE_CHECK([version of ghc], FPTOOLS_CV_GHC_VERSION, [dnl
-${GHC-ghc} --version > conftestghc 2>&1
+${WithGhc-ghc} --version > conftestghc 2>&1
   cat conftestghc >&AC_FD_CC
 dnl `Useless Use Of cat' award...
 changequote(<<, >>)dnl
-  FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9.]\+\).*/\1/p'`
+  FPTOOLS_CV_GHC_VERSION=`cat conftestghc | sed -n -e 's/, patchlevel *\([0-9]\)/.\1/;s/.* version \([0-9][0-9.]*\).*/\1/p'`
 changequote([, ])dnl
   rm -fr conftest*
   if test "[$]FPTOOLS_CV_GHC_VERSION" = ""
@@ -432,7 +436,7 @@ main()
 {
   FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
-  fprintf(f, "%d\n", offsetof(struct { char c; $1 ty;},ty));
+  fprintf(f, "%d", offsetof(struct { char c; $1 ty;},ty));
   exit(0);
 }],
 AC_CV_NAME=`cat conftestval`,
@@ -816,7 +820,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.56 2000/09/10 17:39:26 panne Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.60 2000/11/19 18:32:56 simonmar Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 # FPTOOLS_CHECK_LIBM - check for math library
@@ -904,7 +908,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.56 2000/09/10 17:39:26 panne Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.60 2000/11/19 18:32:56 simonmar Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 AC_DEFUN(FPTOOLS_HAVE_OPENGL,