From d21037519f0ff35e08894a690345d6e7305dc634 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Mon, 11 Oct 2010 15:55:40 -0500
Subject: [PATCH] aclocal: Detect the mingw variant named amd64-mingw32msvc.

---
 aclocal.m4 | 3 ++-
 configure  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 021159d9890..485f8d63fed 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -128,7 +128,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG],
     ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32],
                         m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;;
   x86_64)
-    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;;
+    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc],
+                        m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;;
   *)
     ac_prefix_list="" ;;
 esac
diff --git a/configure b/configure
index 24deb976e06..e2b72570a81 100755
--- a/configure
+++ b/configure
@@ -7018,7 +7018,7 @@ then
   i[3456789]86*)
     ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;;
   x86_64)
-    ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;;
+    ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;;
   *)
     ac_prefix_list="" ;;
 esac