Re: bootstrap's function find_tool

[Jim Meyering]

Thomas Treichl wrote:
> a month ago I was still working on an older OS X 10.4 system and tried
> to compile recent sources of GNU Octave which now uses the bootstrap
> file. I failed with a local copy of gnulib (I used the option
> --gnulib-srcdir=<path>) because I didn't have any of the tools
> gsha1sum, sha1sum etc. We started a discussion about it here
>
>
> http://old.nabble.com/bootstrap%2C-sha1sum%2C-gsha1sum-and-such-things--to26791930.html
>
> No my suggestion to the GNU Octave project was to comment out the line
>
>   find_tool SHA1SUM sha1sum gsha1sum
>
> which of course is not the best solution. In our discussion we found
> out that the best solution might be to check for the tools right
> before they are really used for the first time - if given the option
> --gnulib-srcdir=<path> none of these tools should be needed, right? Is
> it possible that you make such a change please?

SHA1SUM is used to help manage po files, independently
of whether you specify --gnulib-srcdir.

> Meanwhile I personally changed to OS X 10.6 and must say now, that we
> have such a tool which is called "shasum" and is part of the OS itself
> at
>
>   MyMac$ which shasum
>   /usr/bin/shasum
>
> Maybe this should be added to the list of the find_tool line.

Thanks for the suggestion.
I've added it:

>From 6d28070c3cc7a02107bf66402983b9fe4c6f8f6f Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 25 Jan 2010 12:54:12 +0100
Subject: [PATCH] bootstrap: detect MacOS 10.6's shasum, too

* build-aux/bootstrap: Also recognize MacOS 10.6's shasum.
Suggested by Thomas Treichl <address@hidden>.
---
 ChangeLog           |    6 ++++++
 build-aux/bootstrap |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc7ce79..2c79e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-25  Jim Meyering  <address@hidden>
+
+       bootstrap: detect MacOS 10.6's shasum, too
+       * build-aux/bootstrap: Also recognize MacOS 10.6's shasum.
+       Suggested by Thomas Treichl <address@hidden>.
+
 2010-01-23  Jim Meyering  <address@hidden>

        xstrtoll: new module
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 7781446..0fb0ac5 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -188,8 +188,8 @@ find_tool ()
   eval "export $find_tool_envvar"
 }

-# Find sha1sum, named gsha1sum on MacPorts.
-find_tool SHA1SUM sha1sum gsha1sum
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+find_tool SHA1SUM sha1sum gsha1sum shasum

 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
--
1.6.6.1.557.g77031