X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=113889a9d4376719bc64d4dbafe6b90ed2a94bb9;hb=e3c8a2a3fd8fa864b6b25ea7e3dffba634e24813;hp=c4b1eb83c3af4da0abbb3dd92eb5fccf76177a38;hpb=37fe79750c2a2f72567e0655b697eaab3ad720e8;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index c4b1eb8..113889a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -292,7 +292,7 @@ AC_SUBST(GreenCardVersion)
 
 dnl
 dnl Check for Happy and version.  If we're building GHC, then we need
-dnl at least Happy version 1.13.  If there's no installed Happy, we look
+dnl at least Happy version 1.14.  If there's no installed Happy, we look
 dnl for a happy source tree and point the build system at that instead.
 dnl
 AC_DEFUN(FPTOOLS_HAPPY,
@@ -318,8 +318,8 @@ fi;
 changequote([, ])dnl
 ])
 if test -d $srcdir/ghc -a ! -f $srcdir/ghc/compiler/parser/Parser.hs; then
-  FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.13],
-  [AC_MSG_ERROR([Happy version 1.13 or later is required to compile GHC.])])[]dnl
+  FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.14],
+  [AC_MSG_ERROR([Happy version 1.14 or later is required to compile GHC.])])[]dnl
 fi
 HappyVersion=$fptools_cv_happy_version;
 AC_SUBST(HappyVersion)
@@ -777,79 +777,6 @@ AS_VAR_POPDEF([fp_func])dnl
 ])# FP_CHECK_FUNC
 
 
-dnl Based on AC_TRY_LINK - run iftrue if links cleanly with no warning
-
-dnl FPTOOLS_TRY_LINK_NOWARN(flags,main?,iftrue,iffalse)
-
-AC_DEFUN(FPTOOLS_TRY_LINK_NOWARN,
-[
-ac_save_LIBS="$LIBS"
-LIBS=[$1];
-cat > conftest.$ac_ext <<EOF
-dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __oline__ "[$]0"
-[#]line __oline__ "configure"
-#include "confdefs.h"
-[$2]
-int t() { return 0; }
-EOF
-if AC_TRY_EVAL(ac_link); then
-  ifelse([$3], , :, [
-    LIBS="$ac_save_LIBS"
-    rm -rf conftest*
-    $3])
-  ifelse([$4], , , [else
-    LIBS="$ac_save_LIBS"
-    rm -rf conftest*
-    $4
-])dnl
-fi
-rm -f conftest*
-]
-)
-
-dnl Loosely based on AC_CHECK_LIB in acgeneral.m4 in autoconf distribution
-
-dnl FPTOOLS_CHECK_FLAG_NOWARN(NAME, FLAG, CODE, iftrue, iffalse)
-
-AC_DEFUN(FPTOOLS_CHECK_FLAG_NOWARN,
-[AC_MSG_CHECKING([for $1])
- AC_CACHE_VAL(ac_cv_flag_$1,
-   [FPTOOLS_TRY_LINK_NOWARN("$2", [main() { $3; exit(0); } ],
-     eval "ac_cv_flag_$1=yes",
-     eval "ac_cv_flag_$1=no"
-   )]
- )
-if eval "test \"`echo '$ac_cv_flag_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  LIBS="$2 $LIBS"
-  $4
-else
-  AC_MSG_RESULT(no)
-  $5
-fi
-])
-
-dnl FPTOOLS_CHECK_LIB_NOWARN(LIBRARY, FUNCTION)
-
-AC_DEFUN(FPTOOLS_CHECK_LIB_NOWARN,
-[FPTOOLS_CHECK_FLAG_NOWARN([function_$2],[],[extern char $2(); $2();],
-[changequote(, )dnl
-  ac_tr_lib=HAVE_LIB`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- changequote([, ])dnl
- AC_DEFINE_UNQUOTED($ac_tr_lib)
-],
-[FPTOOLS_CHECK_FLAG_NOWARN([library_$1],[-l$1],[extern char $2(); $2();],
-[changequote(, )dnl
-  ac_tr_lib=HAVE_LIB`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- changequote([, ])dnl
- AC_DEFINE_UNQUOTED($ac_tr_lib)
-],
-[]
-)])]
-)
-
-
 dnl ** Check which CATALOG file we have to use with DocBook SGML.
 dnl
 dnl FPTOOLS_DOCBOOK_CATALOG(VARIABLE, JADE, STYLESHEET, CATALOGS-TO-CHECK-FOR)
@@ -1009,7 +936,7 @@ else
   esac
 
   if test x"$use_quartz_opengl" != xyes; then
-    AC_CHECK_LIB([m], [main], [GL_LIBS="-lm $GL_LIBS"])
+    AC_CHECK_LIB([m], [atan], [GL_LIBS="-lm $GL_LIBS"])
 
     if test x"$no_x" != xyes; then
       test -n "$x_includes" && GL_CFLAGS="-I$x_includes $GL_CFLAGS"