X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=dc94cf3f72071d0475795141cb3c87eda0d8e361;hp=2739394cfeb20c558a16d4eb23362bd1bea2973f;hb=4c9154facefe185dcbb99e2bb1cfe118f02f8bd3;hpb=89c562301fb110184fb9f604c5ad2fd6a10b7fe9

diff --git a/configure.ac b/configure.ac
index 2739394..dc94cf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.13], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.1], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
@@ -426,28 +426,38 @@ then
     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 ||
-         test inplace/mingw -ot ghc-tarballs/mingw/gcc-g++*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/libcrypt*.tar.bz2 ||
-         test inplace/mingw -ot ghc-tarballs/mingw/mingw-runtime*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz
+         test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.lzma  ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.lzma  ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-c++*.tar.lzma   ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libgmp*.tar.gz      ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libmpc*.tar.gz      ||
+         test inplace/mingw -ot ghc-tarballs/mingw/libmpfr*.tar.gz     ||
+         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dev.tar.gz ||
+         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*-dll.tar.gz ||
+         test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.lzma
     then
         AC_MSG_NOTICE([Making in-tree mingw tree])
         rm -rf inplace/mingw
-        mkdir inplace
+        test -d inplace || mkdir inplace
         mkdir inplace/mingw
         (
             cd inplace/mingw &&
-            tar -zxf ../../ghc-tarballs/mingw/binutils*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/gcc-g++*.tar.gz &&
-            tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2 &&
-            tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/binutils*.tar.lzma  &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-core*.tar.lzma  &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-c++*.tar.lzma   &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libgmp*.tar.lzma    &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libmpc*.tar.lzma    &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/libmpfr*.tar.lzma   &&
+            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*-dev.tar.gz &&
+            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*-dll.tar.gz &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma    &&
             mv bin/gcc.exe bin/realgcc.exe
         )
-        inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
+        PATH=`pwd`/inplace/mingw/bin:$PATH inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
+        if ! test -e inplace/mingw/bin/gcc.exe
+        then
+            AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+        fi
         AC_MSG_NOTICE([In-tree mingw tree created])
     fi
     if ! test -d inplace/perl ||
@@ -940,7 +950,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 docs/index.html 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 utils/runghc/runghc.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