ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Get rid of the prog parameter in WINE_CHECK_MINGW_PROG. 

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
André Hentschel 2015-12-30 14:27:52 +01:00 committed by Alexandre Julliard
parent e0737207e7
commit 8ea38973dc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aclocal.m4 vendored
View File

@ -171,21 +171,21 @@ LIBS="$ac_wine_check_funcs_save_LIBS"])
dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl **** Check for a mingw program, trying the various mingw prefixes ****
dnl 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 dnl
AC_DEFUN([WINE_CHECK_MINGW_PROG], AC_DEFUN([WINE_CHECK_MINGW_PROG],
[case "$host_cpu" in [case "$host_cpu" in
i[[3456789]]86*) i[[3456789]]86*)
ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], 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 ])) m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ]))
mingw32-$2" ;; mingw32-gcc" ;;
x86_64) x86_64)
ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], 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="" ;; ac_prefix_list="" ;;
esac 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 **** dnl **** Define helper functions for creating config.status files ****

2
configure.ac
View File

@ -944,7 +944,7 @@ dnl Check for cross compiler to build test programs
AC_SUBST(CROSSTARGET,"") AC_SUBST(CROSSTARGET,"")
if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll"
then then
WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) WINE_CHECK_MINGW_PROG(CROSSCC,false)
if test "$CROSSCC" != "false" if test "$CROSSCC" != "false"
then then
ac_save_CC="$CC" ac_save_CC="$CC"