diff options
| -rw-r--r-- | config/acx.m4 | 3 | ||||
| -rwxr-xr-x | configure | 64 |
2 files changed, 8 insertions, 59 deletions
diff --git a/config/acx.m4 b/config/acx.m4 index 3c5fe67..c45e55e 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -427,8 +427,7 @@ fi # Test for Rust # We require cargo and rustc for some parts of the rust compiler. AC_DEFUN([ACX_PROG_CARGO], -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) -AC_CHECK_TOOL(CARGO, cargo, no) +[AC_CHECK_PROGS(CARGO, cargo, no) if test "x$CARGO" != xno; then have_cargo=yes else @@ -5787,10 +5787,10 @@ else have_gdc=no fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cargo", so it can be a program name with args. -set dummy ${ac_tool_prefix}cargo; ac_word=$2 +for ac_prog in cargo +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_CARGO+:} false; then : @@ -5806,7 +5806,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CARGO="${ac_tool_prefix}cargo" + ac_cv_prog_CARGO="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5826,59 +5826,9 @@ $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_CARGO"; then - ac_ct_CARGO=$CARGO - # Extract the first word of "cargo", so it can be a program name with args. -set dummy cargo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CARGO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CARGO"; then - ac_cv_prog_ac_ct_CARGO="$ac_ct_CARGO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CARGO="cargo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi + test -n "$CARGO" && break done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CARGO=$ac_cv_prog_ac_ct_CARGO -if test -n "$ac_ct_CARGO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CARGO" >&5 -$as_echo "$ac_ct_CARGO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CARGO" = x; then - CARGO="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CARGO=$ac_ct_CARGO - fi -else - CARGO="$ac_cv_prog_CARGO" -fi +test -n "$CARGO" || CARGO="no" if test "x$CARGO" != xno; then have_cargo=yes |