Alexandre Julliard : configure: Don't accept mingw32 as target name, we need an explicit CPU specification.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Jun 18 21:35:51 2009 +0200

configure: Don't accept mingw32 as target name, we need an explicit CPU specification.

---

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

diff --git a/aclocal.m4 b/aclocal.m4
index e73b934..90e166d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -141,7 +141,7 @@ dnl
 AC_DEFUN([WINE_CHECK_MINGW_PROG],
 [AC_CHECK_PROGS([$1],
    m4_foreach([ac_wine_prefix],
-              [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw],
+              [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32],
               [ac_wine_prefix-$2 ]),
    [$3],[$4])])
 
diff --git a/configure b/configure
index 7d18ad5..b4163cd 100755
--- a/configure
+++ b/configure
@@ -8233,7 +8233,7 @@ fi
 
 if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
 then
-    for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc
+    for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-pc-mingw32-gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8276,7 +8276,7 @@ fi
 done
 test -n "$CROSSCC" || CROSSCC="false"
 
-    for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool
+    for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool i686-pc-mingw32-dlltool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8319,7 +8319,7 @@ fi
 done
 test -n "$DLLTOOL" || DLLTOOL="false"
 
-    for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar
+    for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar i686-pc-mingw32-ar
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2