X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=634b66b2bb939565b015fe4c206d1cfce3307a62;hb=636c2750c90e540ed3d4fb66c8dd4dae876945e7;hp=9ab6b3435bf2e1fb8f66870c934263dc2cd90dd7;hpb=4b8a6d6c34bd74a4e3ac4d5d3c19e1236b1882dd;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 9ab6b34..634b66b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.13], [glasgow-hask
 # 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 'sh boot'?"
+   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'perl boot'?"
    exit 1
 fi
 
@@ -197,16 +197,8 @@ AC_SUBST(ICONV_LIB_DIRS)
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
-dnl We don't use the standard autoconf macros for this, but instead
-dnl ask the bootstrapping compiler what platform it is for
-
-dnl Guess host/target/build platform(s) if necessary.
-m4_divert_once([HELP_CANON],
-[[
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [guessed]
-  --target=TARGET   configure for building compilers for TARGET [guessed]]])dnl
+dnl If we aren't explicitly told what values to use with configure flags,
+dnl we ask the bootstrapping compiler what platform it is for
 
 if test "${WithGhc}" != ""
 then
@@ -424,6 +416,7 @@ then
     CC="$hardtop/inplace/mingw/bin/gcc.exe"
     LD="$hardtop/inplace/mingw/bin/ld.exe"
     NM="$hardtop/inplace/mingw/bin/nm.exe"
+    fp_prog_ar_raw="$hardtop/inplace/mingw/bin/ar.exe"
     if ! test -d inplace/mingw ||
          test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.gz ||
          test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.gz ||
@@ -915,7 +908,7 @@ if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml libraries/prologue.txt distrib/ghc.iss distrib/configure.ac])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT