=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: configure: Get rid of the prog parameter in WINE_CHECK_MINGW_PROG.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Dec 30 18:33:44 CST 2015
Module: wine
Branch: master
Commit: 8ea38973dc43e018a61c38d66d0196535f5f729f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea38973dc43e018a61c38d66d0196535f5f729f
Author: André Hentschel <nerv at dawncrow.de>
Date: Wed Dec 30 14:27:52 2015 +0100
configure: Get rid of the prog parameter in WINE_CHECK_MINGW_PROG.
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
aclocal.m4 | 10 +++++-----
configure.ac | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 1cd7d1d..92bd39f 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 c4184cf..7792f1c 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"
More information about the wine-cvs
mailing list