X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=ac69cb1387bfa199a9b6797d837574ee0d9aa5fc;hp=39856a2caaae4e870fbe893fc53738f1769e4095;hb=6a250480f62ad4e04d0f28880340dca200baae81;hpb=ca5ded310c0a596be199a3da5f14be2fb2020687

diff --git a/configure.ac b/configure.ac
index 39856a2..ac69cb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,12 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haske
 # when the source distribution was created.
 
 if test ! -f mk/config.h.in; then
-   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'autoreconf'?"
+   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'sh boot'?"
    exit 1
 fi
 
+AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
+
 FP_SETUP_PROJECT_VERSION
 
 # Hmmm, we fix the RPM release number to 1 here... Is this convenient?
@@ -44,13 +46,6 @@ dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
 dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH.
 AC_PREREQ([2.52])
 
-dnl * Declare subdirectories that have a private configure script
-dnl
-dnl After the toplevel configuration is complete, the script will recurse into
-dnl these subdirectories if they exist. The use of a cache file makes repeated
-dnl checks cheap.
-AC_CONFIG_SUBDIRS([libraries])
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -715,6 +710,18 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcMajVersion)dnl
   AC_SUBST(GhcMinVersion)dnl
   AC_SUBST(GhcPatchLevel)dnl
+  GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
+  GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
+  if test $GhcCanonVersion -ge 504; then ghc_ge_504=YES; else ghc_ge_504=NO; fi
+  if test $GhcCanonVersion -ge 601; then ghc_ge_601=YES; else ghc_ge_601=NO; fi
+  if test $GhcCanonVersion -ge 602; then ghc_ge_602=YES; else ghc_ge_602=NO; fi
+  if test $GhcCanonVersion -ge 603; then ghc_ge_603=YES; else ghc_ge_603=NO; fi
+  if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
+  AC_SUBST(ghc_ge_504)dnl
+  AC_SUBST(ghc_ge_601)dnl
+  AC_SUBST(ghc_ge_602)dnl
+  AC_SUBST(ghc_ge_603)dnl
+  AC_SUBST(ghc_ge_605)dnl
 fi
 
 # Check whether this GHC has readline installed
@@ -744,6 +751,25 @@ AC_ARG_WITH(gcc,
 )
 AC_SUBST(WhatGccIsCalled)
 
+dnl ** Which ld to use?
+dnl --------------------------------------------------------------
+AC_ARG_WITH(ld,
+[AC_HELP_STRING([--with-ld=ARG],
+        [Use ARG as the path to LD  [default=autodetect]])],
+[if test "x$HostPlatform" = "xi386-unknown-mingw32"
+    then
+       if test "${OSTYPE}" != "msys"
+         then
+         # Canonicalise to <drive>:/path/to/ld
+         withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
+       fi
+ fi;
+ LD=$withval
+ FP_PROG_LD([$LD])
+ ],
+ [FP_PROG_LD()]
+)
+
 dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot,