Paul Vriens : aclocal.m4: Add i686-pc-mingw32 to the cross-compiler prefixes.

[Alexandre Julliard]

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

Author: Paul Vriens 
Date:   Tue Nov 25 20:27:45 2008 +0100

aclocal.m4: Add i686-pc-mingw32 to the cross-compiler prefixes.

---

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

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

diff --git a/configure b/configure
index 5b4c30c..8158ab9 100755
--- a/configure
+++ b/configure
@@ -9707,7 +9707,7 @@ fi

if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
 then
-    for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
+    for ac_prog in 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
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9750,7 +9750,7 @@ fi
 done
 test -n "$CROSSCC" || CROSSCC="false"

-    for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
+    for ac_prog in 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
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -9793,7 +9793,7 @@ fi
 done
 test -n "$DLLTOOL" || DLLTOOL="false"

-    for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres
+    for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-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
@@ -9836,7 +9836,7 @@ fi
 done
 test -n "$CROSSWINDRES" || CROSSWINDRES="false"

-    for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar
+    for ac_prog in 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
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2