Better error message.

	* bootstrap (find_tool): Fix the error message.

diff --git a/ChangeLog b/ChangeLog
index bd530d5b472c8a1484a808f6f75442c164ca247a..6364361c1429d4fee9c13b49f9e29a50e4bf8dc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-15  Akim Demaille  <demaille@gostai.com>
+
+       Better error message.
+       * bootstrap (find_tool): Fix the error message.
+

 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Update variant.yy to newest interface.
 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Update variant.yy to newest interface.

diff --git a/bootstrap b/bootstrap
index f92d1ccd8ef55b5ffe8918b74b0d760a231d90ff..dbeb0b8dbc02623d3637cff368198ae65fcc0eb1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -144,9 +144,9 @@ vc_ignore=auto
 # -------------------------
 find_tool ()
 {
 # -------------------------
 find_tool ()
 {

-  # Find sha1sum, named gsha1sum on MacPorts.

   find_tool_envvar=$1
   shift
   find_tool_envvar=$1
   shift

+  find_tool_name=$@

   if eval test x"\$$find_tool_envvar" = x; then
     for i
     do
   if eval test x"\$$find_tool_envvar" = x; then
     for i
     do


@@ -157,7 +157,7 @@ find_tool ()
     done
   fi
   if test x"$find_tool_res" = x; then
     done
   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 || {
     exit 1
   fi
   ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {