Avoid warnings from gcc -Wundef y.tab.c.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 02176d280a61ec7877bfe610a8e39ff4aadf4842..00ea4bc1a30720e57df209c806220d974ad61c5f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -36,7 +36,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
 bt2=${bt}2
 
 usage() {

-  echo >&2 "\
+  cat <<EOF

 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 


@@ -57,7 +57,7 @@ If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.

-"
+EOF

 }
 
 # Configuration.
 }
 
 # Configuration.


@@ -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
   shift
   find_tool_envvar=$1
   shift

-  find_tool_name=$@
-  if eval test x"\$$find_tool_envvar" = x; then
+  find_tool_names=$@
+  eval "find_tool_res=\$$find_tool_envvar"
+  if test x"$find_tool_res" = x; then

     for i
     do
       if ($i --version </dev/null) >/dev/null 2>&1; then
     for i
     do
       if ($i --version </dev/null) >/dev/null 2>&1; then

-       find_tool_res=$i
-       break
+       find_tool_res=$i
+       break

       fi
     done
       fi
     done

+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "

   fi
   if test x"$find_tool_res" = x; then
     echo >&2 "$0: one of these is required: $find_tool_names"
     exit 1
   fi
   ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
   fi
   if test x"$find_tool_res" = x; then
     echo >&2 "$0: one of these is required: $find_tool_names"
     exit 1
   fi
   ($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"
 }