Get rid of yyrhs and yyprhs in glr.c.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index c3c7748b9110f577187f80f2823c92ec3eaad000..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 || {


@@ -614,12 +614,6 @@ if test -f $mam_template; then
   done
 fi
 
   done
 fi
 

-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-

 # Reconfigure, getting other files.
 
 for command in \
 # Reconfigure, getting other files.
 
 for command in \