Jacek Caban : aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 609be12dab74b82492022cd1e8e09e26b3f3c9c5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=609be12dab74b82492022cd1e8...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Tue Dec 21 18:08:38 2010 +0100

aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler.
(cherry picked from commit 0b6bfade5240eafe1c9ab5653192dc88ccf31b0d)

---

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

diff --git a/aclocal.m4 b/aclocal.m4
index a77f15e..e46da7b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -125,7 +125,7 @@ dnl
 AC_DEFUN([WINE_CHECK_MINGW_PROG],
 [case "$host_cpu" in
   i[[3456789]]86*)
-    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32],
+    ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, 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 ])" ;;
diff --git a/configure b/configure
index 08fd4b0..638d7ba 100755
--- a/configure
+++ b/configure
@@ -7008,7 +7008,7 @@ if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
 then
     case "$host_cpu" in
   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 " ;;
+    ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc 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 " ;;
   *)