Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap: fix/improve find_tool.

Browse Source 
* bootstrap (find_tool): Improve error messages.
	Fix typo about find_tool_names.
This commit is contained in:
Akim Demaille
2009-09-03 10:50:32 +02:00
parent 2646cd540b
commit 1deef26d0c
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2009-09-03 Akim Demaille <demaille@gostai.com>
bootstrap: fix/improve find_tool.
* bootstrap (find_tool): Improve error messages.
Fix typo about find_tool_names.
2009-08-29 Joel E. Denny <jdenny@clemson.edu> 2009-08-29 Joel E. Denny <jdenny@clemson.edu>
Fix gcc 3.4.4 shadowing warning reported by Eric Blake. Fix gcc 3.4.4 shadowing warning reported by Eric Blake.

20
bootstrap
View File

@@ -142,29 +142,37 @@ vc_ignore=auto
# find_tool ENVVAR NAMES... # 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_tool ()
{ {
# Find sha1sum, named gsha1sum on MacPorts.
find_tool_envvar=$1 find_tool_envvar=$1
shift shift
find_tool_name=$@ find_tool_names=$@
if eval test x"\$$find_tool_envvar" = x; then eval "find_tool_res=\$$find_tool_envvar"
if test x"$find_tool_res" = x; then
for i for i
do do
if ($i --version </dev/null) >/dev/null 2>&1; then if ($i --version </dev/null) >/dev/null 2>&1; then
find_tool_res=$i find_tool_res=$i
break break
fi fi
done done
else
find_tool_error_prefix="\$$find_tool_envvar: "
fi fi
if test x"$find_tool_res" = x; then if test x"$find_tool_res" = x; then
echo >&2 "$0: one of these is required: $find_tool_names" echo >&2 "$0: one of these is required: $find_tool_names"
exit 1 exit 1
fi fi
($find_tool_res --version </dev/null) >/dev/null 2>&1 || { ($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 exit 1
} }
eval "$find_tool_envvar=\"$find_tool_res\"" eval "$find_tool_envvar=\$find_tool_res"
eval "export $find_tool_envvar" eval "export $find_tool_envvar"
} }