X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=1b8b729b4d48317e90441fe52f50f5dfc1721bf8;hb=776afe7766a4fe991dbb5a38595900ebd95d4d5a;hp=547f864f94021ce9e62857924b4b1da4976ad751;hpb=a69327edb251674e7828445fbf1263ffc55823a2;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 547f864..1b8b729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,11 +577,11 @@ if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
-dnl ** Enable multi-thread friendly RTS?
+dnl ** --enable-threaded-rts (not used any more)
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(threaded-rts,
 [AC_HELP_STRING([--enable-threaded-rts],
-[Support better interop with OS threads. [default=no]])],
+[DEPRECATED (backwards compatibility only). [default=no]])],
 [ if test x"$enableval" = x"yes"; then
 	ThreadedRts=YES
   else
@@ -752,7 +752,8 @@ dnl If you can run configure, you certainly have /bin/sh
 AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
 
 dnl ** how to invoke `ar' and `ranlib'
-FPTOOLS_PROG_AR_AND_RANLIB
+FP_PROG_AR_NEEDS_RANLIB
+FP_PROG_AR_SUPPORTS_INPUT
 
 dnl ** Check to see whether ln -s works
 AC_PROG_LN_S
@@ -1218,6 +1219,13 @@ AC_SUBST([LIBM])
 dnl ** check for X Window System
 AC_PATH_XTRA()
 
+if test "$no_x" = yes; then
+  GhcLibsWithX11=NO
+else
+  GhcLibsWithX11=YES
+fi
+AC_SUBST([GhcLibsWithX11])
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################