From 8ea38973dc43e018a61c38d66d0196535f5f729f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
Date: Wed, 30 Dec 2015 14:27:52 +0100
Subject: [PATCH] configure: Get rid of the prog parameter in
 WINE_CHECK_MINGW_PROG.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 aclocal.m4   | 10 +++++-----
 configure.ac |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 1cd7d1df3ad..92bd39f8712 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -171,21 +171,21 @@ LIBS="$ac_wine_check_funcs_save_LIBS"])
 
 dnl **** Check for a mingw program, trying the various mingw prefixes ****
 dnl
-dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path])
+dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path])
 dnl
 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 ]))
-                        mingw32-$2" ;;
+                        m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ]))
+                        mingw32-gcc" ;;
   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 ]))" ;;
+                        m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ]))" ;;
   *)
     ac_prefix_list="" ;;
 esac
-AC_CHECK_PROGS([$1],[$ac_prefix_list],[$3],[$4])])
+AC_CHECK_PROGS([$1],[$ac_prefix_list],[$2],[$3])])
 
 
 dnl **** Define helper functions for creating config.status files ****
diff --git a/configure.ac b/configure.ac
index c4184cf7e89..7792f1c8971 100644
--- a/configure.ac
+++ b/configure.ac
@@ -944,7 +944,7 @@ dnl Check for cross compiler to build test programs
 AC_SUBST(CROSSTARGET,"")
 if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll"
 then
-    WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false)
+    WINE_CHECK_MINGW_PROG(CROSSCC,false)
     if test "$CROSSCC" != "false"
     then
         ac_save_CC="$CC"