Peter Oberndorfer : configure: Recognize i686-mingw32 prefix for crosscompiling.

[Alexandre Julliard]

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

Author: Peter Oberndorfer 
Date:   Sun Sep 16 20:11:12 2007 +0200

configure: Recognize i686-mingw32 prefix for crosscompiling.

---

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

diff --git a/aclocal.m4 b/aclocal.m4
index 1799ff0..a0b08d7 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],
-              [i586-mingw32msvc, i386-mingw32msvc, i386-mingw32, mingw32, mingw],
+              [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i386-mingw32, mingw32, mingw],
               [ac_wine_prefix-$2 ]),
    [$3],[$4])])

diff --git a/configure b/configure
index 54cd060..9b5d197 100755
--- a/configure
+++ b/configure
@@ -8876,7 +8876,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; }

if test "$cross_compiling" = "no"
     then
-      for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
+      for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-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
@@ -8919,7 +8919,7 @@ fi
 done
 test -n "$CROSSCC" || CROSSCC="false"

-      for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
+      for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-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
@@ -8962,7 +8962,7 @@ fi
 done
 test -n "$DLLTOOL" || DLLTOOL="false"

-      for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres
+      for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9005,7 +9005,7 @@ fi
 done
 test -n "$CROSSWINDRES" || CROSSWINDRES="false"

-      for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i386-mingw32-ar mingw32-ar mingw-ar
+      for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i386-mingw32-ar mingw32-ar mingw-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