Mercurial > hg > octave-kai > gnulib-hg
changeset 11854:e11202dcc2b8
bootstrap: find sha1sum when named gsha1sum.
* bootstrap (find_tool): New.
($SHA1SUM): New.
Use it.
author | Akim Demaille <demaille@gostai.com> |
---|---|
date | Wed, 19 Aug 2009 15:37:23 +0200 |
parents | 97a383c7cec4 |
children | e53ecd6bb7d0 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 40 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-08-19 Akim Demaille <demaille@gostai.com> + + bootstrap: find sha1sum when named gsha1sum. + * bootstrap (find_tool): New. + ($SHA1SUM): New. + Use it. + 2009-08-20 Jim Meyering <meyering@redhat.com> maint.mk: _header_without_use: fix a quoting bug and remove a bash'ism
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -148,6 +148,37 @@ # on which version control system (if any) is used in the source directory. vc_ignore=auto +# find_tool ENVVAR NAMES... +# ------------------------- +find_tool () +{ + # Find sha1sum, named gsha1sum on MacPorts. + find_tool_envvar=$1 + shift + if eval test x"\$$find_tool_envvar" = x; then + for i + do + if ($i --version </dev/null) >/dev/null 2>&1; then + find_tool_res=$i + break + fi + done + fi + if test x"$find_tool_res" = x; then + echo >&2 "$0: $find_tool_name is required" + exit 1 + fi + ($find_tool_res --version </dev/null) >/dev/null 2>&1 || { + echo >&2 "$0: cannot run $find_tool_res --version" + exit 1 + } + eval "$find_tool_envvar=\"$find_tool_res\"" + eval "export $find_tool_envvar" +} + +# Find sha1sum, named gsha1sum on MacPorts. +find_tool SHA1SUM sha1sum gsha1sum + # Override the default configuration, if necessary. # Make sure that bootstrap.conf is sourced from the current directory # if we were invoked as "sh bootstrap". @@ -420,11 +451,11 @@ cksum_file="$ref_po_dir/$po.s1" if ! test -f "$cksum_file" || ! test -f "$po_dir/$po.po" || - ! ${SHA1SUM-sha1sum} -c --status "$cksum_file" \ + ! $SHA1SUM -c --status "$cksum_file" \ < "$new_po" > /dev/null; then echo "updated $po_dir/$po.po..." cp "$new_po" "$po_dir/$po.po" \ - && ${SHA1SUM-sha1sum} < "$new_po" > "$cksum_file" + && $SHA1SUM < "$new_po" > "$cksum_file" fi done }