TcHsType: set the kind for tyvars that occur in explicit code types

[ghc-hetmet.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 4b6e855..4b750ef 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -646,32 +646,6 @@ fi
 ])# FP_PROG_AR_NEEDS_RANLIB
 
 
 ])# FP_PROG_AR_NEEDS_RANLIB
 
 

-# FP_PROG_AR_SUPPORTS_INPUT
-# -------------------------
-# Sets the output variable ArSupportsInput to "-input" or "", depending on
-# whether ar supports -input flag is supported or not.
-AC_DEFUN([FP_PROG_AR_SUPPORTS_INPUT],
-[AC_REQUIRE([FP_PROG_AR_IS_GNU])
-AC_REQUIRE([FP_PROG_AR_ARGS])
-AC_CACHE_CHECK([whether $fp_prog_ar_raw supports -input], [fp_cv_prog_ar_supports_input],
-[fp_cv_prog_ar_supports_input=no
-if test $fp_prog_ar_is_gnu = no; then
-  rm -f conftest*
-  touch conftest.lst
-  if FP_EVAL_STDERR(["$fp_prog_ar_raw" $fp_prog_ar_args conftest.a -input conftest.lst]) >/dev/null; then
-    test -s conftest.err || fp_cv_prog_ar_supports_input=yes
-  fi
-  rm -f conftest*
-fi])
-if test $fp_cv_prog_ar_supports_input = yes; then
-    ArSupportsInput="-input"
-else
-    ArSupportsInput=""
-fi
-AC_SUBST([ArSupportsInput])
-])# FP_PROG_AR_SUPPORTS_INPUT
-
-

 dnl
 dnl AC_SHEBANG_PERL - can we she-bang perl?
 dnl
 dnl
 dnl AC_SHEBANG_PERL - can we she-bang perl?
 dnl

@@ -691,11 +665,11 @@ rm -f conftest
 ])])
 
 
 ])])
 
 

-# FP_HAVE_GCC
+# FP_GCC_VERSION

 # -----------
 # Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the
 # output variable GccVersion.
 # -----------
 # Extra testing of the result AC_PROG_CC, testing the gcc version no. Sets the
 # output variable GccVersion.

-AC_DEFUN([FP_HAVE_GCC],
+AC_DEFUN([FP_GCC_VERSION],

 [AC_REQUIRE([AC_PROG_CC])
 if test -z "$GCC"
 then
 [AC_REQUIRE([AC_PROG_CC])
 if test -z "$GCC"
 then

@@ -714,7 +688,7 @@ AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version],
 ])
 AC_SUBST([GccVersion], [$fp_cv_gcc_version])
 AC_SUBST(GccLT34)
 ])
 AC_SUBST([GccVersion], [$fp_cv_gcc_version])
 AC_SUBST(GccLT34)

-])# FP_HAVE_GCC
+])# FP_GCC_VERSION

 
 dnl Small feature test for perl version. Assumes PerlCmd
 dnl contains path to perl binary.
 
 dnl Small feature test for perl version. Assumes PerlCmd
 dnl contains path to perl binary.

@@ -1086,7 +1060,7 @@ AC_SUBST([GhcPkgCmd])
 # integer wrap around. (Trac #952)
 #
 AC_DEFUN([FP_GCC_EXTRA_FLAGS],
 # integer wrap around. (Trac #952)
 #
 AC_DEFUN([FP_GCC_EXTRA_FLAGS],

-[AC_REQUIRE([FP_HAVE_GCC])
+[AC_REQUIRE([FP_GCC_VERSION])

 AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts],
 [fp_cv_gcc_extra_opts=
  FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
 AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts],
 [fp_cv_gcc_extra_opts=
  FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],

@@ -1520,6 +1494,21 @@ case "$1" in
   esac
 ])
 
   esac
 ])
 

+# BOOTSTRAPPING_GHC_INFO_FIELD
+# --------------------------------
+# If the bootstrapping compiler is >= 7.1, then set the variable
+# $1 to the value of the ghc --info field $2. Otherwise, set it to
+# $3.
+AC_DEFUN([BOOTSTRAPPING_GHC_INFO_FIELD],[
+if test $GhcCanonVersion -ge 701
+then
+    $1=`"$WithGhc" --info | grep "^ ,(\"$2\"," | sed -e 's/.*","//' -e 's/")$//'`
+else
+    $1=$3
+fi
+AC_SUBST($1)
+])
+

 # LIBRARY_VERSION(lib)
 # --------------------------------
 # Gets the version number of a library.
 # LIBRARY_VERSION(lib)
 # --------------------------------
 # Gets the version number of a library.