From: Akim Demaille <demaille@gostai.com>
Date: Wed, 19 Aug 2009 13:37:23 +0000 (+0200)
Subject: bootstrap: find sha1sum when named gsha1sum.
X-Git-Tag: v0.1~5633
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ecda40afafa59d9503f80e0bf869220c218c73a8;p=gnulib.git

bootstrap: find sha1sum when named gsha1sum.

* bootstrap (find_tool): New.
	($SHA1SUM): New.
	Use it.
---

diff --git a/ChangeLog b/ChangeLog
index 700858d7d..b89a48315 100644
--- 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
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 1e7bfac58..417d7ea75 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -148,6 +148,37 @@ copy=false
 # 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 @@ update_po_files() {
     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
 }