Mercurial > hg > octave-kai > gnulib-hg
changeset 11958:f635faf82f32
bootstrap: improve error message
* build-aux/bootstrap (find_tool): Upon failure, report the list
of candidates.
Honor the initial value of the envvar.
author | Akim Demaille <demaille@gostai.com> |
---|---|
date | Thu, 03 Sep 2009 09:55:06 +0200 |
parents | d3de44fd397d |
children | 610ed34b4298 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-06 Akim Demaille <demaille@gostai.com> + + bootstrap: improve error message + * build-aux/bootstrap (find_tool): Upon failure, report the list + of candidates. + Honor the initial value of the envvar. + 2009-09-05 Eric Blake <ebb9@byu.net> symlinkat: new module
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -150,12 +150,18 @@ # find_tool ENVVAR NAMES... # ------------------------- +# Search for a required program. Use the value of ENVVAR, if set, +# otherwise find 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) >/dev/null 2>&1; then @@ -163,16 +169,18 @@ 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) >/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" }