From 0b6bfade5240eafe1c9ab5653192dc88ccf31b0d Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 21 Dec 2010 18:08:38 +0100 Subject: [PATCH] aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 485f8d63fed..39546f0adb5 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, mingw32msvc], diff --git a/configure b/configure index e1da621b8fe..b6444c5d358 100755 --- 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 " ;; *)