[project @ 2001-01-12 20:17:35 by qrczak]

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 1e3d66a..0f59610 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.61 2001/01/08 12:58:45 chak Exp $

 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
 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 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*
 ])
 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
 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
   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" = ""
 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);
 {
   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`,
   exit(0);
 }],
 AC_CV_NAME=`cat conftestval`,

@@ -522,6 +526,46 @@ AC_DEFINE(HAVE_LONG_LONG)
 fi
 ])
 
 fi
 ])
 

+dnl ** Obtain the value of a C constant.
+dnl    The value will be `0' if the constant is undefined.
+dnl
+dnl    This is set up so that the argument can be a shell variable.
+dnl
+AC_DEFUN(FPTOOLS_CHECK_CCONST,
+[
+eval "def_name=CCONST_$1"
+eval "cv_name=ac_cv_cconst_$1"
+AC_MSG_CHECKING(value of $1)
+AC_CACHE_VAL($cv_name,
+[AC_TRY_RUN([#include <stdio.h>
+#include <errno.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", $1);
+  exit(0);
+}], 
+eval "$cv_name=`cat conftestval`",
+eval "$cv_name=0",
+ifelse([$2], , , eval "$cv_name=$2"))])dnl
+eval "fptools_check_cconst_result=`echo '$'{$cv_name}`"
+AC_MSG_RESULT($fptools_check_cconst_result)
+AC_DEFINE_UNQUOTED($def_name, $fptools_check_cconst_result)
+unset fptools_check_cconst_result
+])
+
+dnl ** Invoke AC_CHECK_CCONST on each argument (which have to separate with 
+dnl    spaces)
+dnl
+AC_DEFUN(FPTOOLS_CHECK_CCONSTS,
+[for ac_const_name in $1
+do
+FPTOOLS_CHECK_CCONST($ac_const_name)dnl
+done
+])
+
+

 dnl *** Can we open files in binary mode? ***
 dnl 
 AC_DEFUN(FPTOOLS_O_BINARY,
 dnl *** Can we open files in binary mode? ***
 dnl 
 AC_DEFUN(FPTOOLS_O_BINARY,

@@ -816,7 +860,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.56 2000/09/10 17:39:26 panne Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.61 2001/01/08 12:58:45 chak 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

@@ -904,7 +948,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.56 2000/09/10 17:39:26 panne Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.61 2001/01/08 12:58:45 chak 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,