Module: wine Branch: master Commit: a91fb219a99f236a576454205660d77c5908e27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91fb219a99f236a5764542056...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Dec 7 15:36:09 2009 +0100
aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools.
---
aclocal.m4 | 15 ++++++++++----- configure | 30 +++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 index f7beb5d..ce3941e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,11 +140,16 @@ dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], -[AC_CHECK_PROGS([$1], - m4_foreach([ac_wine_prefix], - [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32], - [ac_wine_prefix-$2 ]), - [$3],[$4])]) +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + 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 **** diff --git a/configure b/configure index 4f52528..785c7b1 100755 --- a/configure +++ b/configure @@ -6948,7 +6948,15 @@ fi
if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" 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 # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6991,7 +6999,15 @@ fi done 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 # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7034,7 +7050,15 @@ fi done 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 # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2