Damjan Jovanovic : configure: Detect mingw32 better on FreeBSD.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 009ad8a4757672fa269752070407b1ae609930be
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=009ad8a4757672fa2697520704...

Author: Damjan Jovanovic <damjan.jov(a)gmail.com>
Date:   Thu Jun 14 08:20:58 2012 +0200

configure: Detect mingw32 better on FreeBSD.

---

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

diff --git a/aclocal.m4 b/aclocal.m4
index e7767ad..0062982 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -126,7 +126,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG],
 [case "$host_cpu" in
   i[[3456789]]86*)
     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 ]))" ;;
+                        m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))
+                        mingw32-$2" ;;
   x86_64)
     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 ]))" ;;
diff --git a/configure b/configure
index e5ccfa8..81d7390 100755
--- a/configure
+++ b/configure
@@ -7127,7 +7127,8 @@ 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-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 " ;;
+    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
+                        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 " ;;
   *)