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

0b6bfade · Jacek Caban · Alexandre Julliard · 5c7bb1e5 · 0b6bfade · 0b6bfade
Commit 0b6bfade authored Dec 21, 2010 by Jacek Caban Committed by Alexandre Julliard Dec 21, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

aclocal.m4 aclocal.m4 +1 -1

configure configure +1 -1

No files found.
--- 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, mingw32msvc],

--- a/configure
+++ b/configure
@@ -7042,7 +7042,7 @@ if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dl
 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 amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;;
  *)