From f2eb7b31c7302eba6c4242625214c41544bfceb5 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 3 Sep 2009 09:55:06 +0200 Subject: [PATCH] bootstrap: improve error message. * build-aux/bootstrap (find_tool): Report the list of programs looked for. Honor the initial value of the envvar. --- build-aux/bootstrap | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 499e97f..dd1dfe3 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -150,12 +150,18 @@ vc_ignore=auto # find_tool ENVVAR NAMES... # ------------------------- +# Look for some needed program. Use the value of the ENVVAR if set, +# otherwise look for the first of the NAMES that can be run (i.e., +# supports --version). If found, set ENVVAR to the program name, +# die otherwise. find_tool () { # Find sha1sum, named gsha1sum on MacPorts. find_tool_envvar=$1 shift - if eval test x"\$$find_tool_envvar" = x; then + find_tool_names=$@ + eval "find_tool_res=\$$find_tool_envvar" + if test x"$find_tool_res" = x; then for i do if ($i --version /dev/null 2>&1; then @@ -163,16 +169,18 @@ find_tool () break fi done + else + find_tool_error_prefix="\$$find_tool_envvar: " fi if test x"$find_tool_res" = x; then - echo >&2 "$0: $find_tool_name is required" + echo >&2 "$0: one of these is required: $find_tool_names" exit 1 fi ($find_tool_res --version /dev/null 2>&1 || { - echo >&2 "$0: cannot run $find_tool_res --version" + echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version" exit 1 } - eval "$find_tool_envvar=\"$find_tool_res\"" + eval "$find_tool_envvar=\$find_tool_res" eval "export $find_tool_envvar" } -- 1.6.4