Skip to content

W
wine-winehq
Commit a91fb219 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools.

parent de239d86
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 8 deletions
aclocal.m4
View file @ a91fb219
...@@ -140,11 +140,16 @@ dnl ...@@ -140,11 +140,16 @@ dnl
dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path])
dnl dnl
AC_DEFUN([WINE_CHECK_MINGW_PROG], AC_DEFUN([WINE_CHECK_MINGW_PROG],
[AC_CHECK_PROGS([$1], [case "$host_cpu" in
m4_foreach([ac_wine_prefix], i[[3456789]]86*)
[$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32], ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32],
[ac_wine_prefix-$2 ]), m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;;
[$3],[$4])]) x86_64)
ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;;
*)
ac_prefix_list="" ;;
esac
AC_CHECK_PROGS([$1],[$ac_prefix_list],[$3],[$4])])
dnl **** Create nonexistent directories from config.status **** dnl **** Create nonexistent directories from config.status ****
......
configure
View file @ a91fb219
...@@ -6948,7 +6948,15 @@ fi ...@@ -6948,7 +6948,15 @@ fi
if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
then then
for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-pc-mingw32-gcc case "$host_cpu" in
i[3456789]86*)
ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;;
x86_64)
ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;;
*)
ac_prefix_list="" ;;
esac
for ac_prog in $ac_prefix_list
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -6991,7 +6999,15 @@ fi ...@@ -6991,7 +6999,15 @@ fi
done done
test -n "$CROSSCC" || CROSSCC="false" test -n "$CROSSCC" || CROSSCC="false"
for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool i686-pc-mingw32-dlltool case "$host_cpu" in
i[3456789]86*)
ac_prefix_list="i686-pc-mingw32-dlltool i586-pc-mingw32-dlltool i486-pc-mingw32-dlltool i386-pc-mingw32-dlltool i686-mingw32msvc-dlltool i586-mingw32msvc-dlltool i486-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool " ;;
x86_64)
ac_prefix_list="x86_64-pc-mingw32-dlltool x86_64-w64-mingw32-dlltool " ;;
*)
ac_prefix_list="" ;;
esac
for ac_prog in $ac_prefix_list
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -7034,7 +7050,15 @@ fi ...@@ -7034,7 +7050,15 @@ fi
done done
test -n "$DLLTOOL" || DLLTOOL="false" test -n "$DLLTOOL" || DLLTOOL="false"
for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar i686-pc-mingw32-ar case "$host_cpu" in
i[3456789]86*)
ac_prefix_list="i686-pc-mingw32-ar i586-pc-mingw32-ar i486-pc-mingw32-ar i386-pc-mingw32-ar i686-mingw32msvc-ar i586-mingw32msvc-ar i486-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar " ;;
x86_64)
ac_prefix_list="x86_64-pc-mingw32-ar x86_64-w64-mingw32-ar " ;;
*)
ac_prefix_list="" ;;
esac
for ac_prog in $ac_prefix_list
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment