X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=aa333f60732caacc05e289b807637388b247280f;hb=3a238f0ff4ad227205356736bf293643e970e424;hp=60371a991282531f6afa5f05f05ab49c8348566b;hpb=a35d65c3465de9661325a9295715b1ef298eb888;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 60371a9..aa333f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,6 +391,7 @@ then
          test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.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/msysCORE*.tar.gz ||
          test inplace/mingw -ot ghc-tarballs/mingw/perl*.tar.bz2 ||
          test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz
     then
@@ -404,6 +405,7 @@ then
             tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz &&
             tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2 &&
             tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz &&
+            tar -zxf ../../ghc-tarballs/mingw/msysCORE*.tar.gz &&
             tar -jxf ../../ghc-tarballs/mingw/perl*.tar.bz2 &&
             tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz &&
             mv bin/gcc.exe bin/realgcc.exe
@@ -426,6 +428,21 @@ FP_ARG_WITH_PATH_GNU_PROG([LD], [ld])
 LdCmd="$LD"
 AC_SUBST([LdCmd])
 
+dnl ** Check for dlltool on Windows
+dnl --------------------------------------------------------------
+case $HostOS_CPP in
+cygwin32|mingw32)
+	AC_PATH_PROG(DlltoolCmd,dlltool)
+	if test -z "$DlltoolCmd"; then
+	  echo "Can't find dlltool in your path, can't make DLLs."
+	  exit 1
+	fi
+	;;
+*)
+	AC_SUBST(DlltoolCmd,"")
+	;;
+esac
+
 dnl ** Which nm to use?
 dnl --------------------------------------------------------------
 FP_ARG_WITH_PATH_GNU_PROG([NM], [nm])
@@ -541,7 +558,7 @@ AC_PATH_PROG(TimeCmd,time)
 
 dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
-AC_PATH_PROGS(TarCmd,gtar tar,tar)
+AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar)
 
 dnl ** check for patch
 dnl if GNU patch is named gpatch, look for it first