(grammar_rule_check): Rewrite slightly to avoid GCC warnings.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 4b6b012f78ace45f172000c743cc744a80fa7bb5..7d094737fa18f9a517b7b91a14f41f1951a1ae97 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -51,11 +51,10 @@ done
 
 echo "$0: Bootstrapping CVS $package..."
 
 
 echo "$0: Bootstrapping CVS $package..."
 

-build_cvs_prefix() {
-  CVS_PREFIX=:${1}:
-  if [ "${2}" != - ]; then
-    CVS_PREFIX=${CVS_PREFIX}${2}@
-  fi
+cleanup_gnulib() {
+  status=$?
+  rm -fr gnulib
+  exit $status

 }
 
 # Get gnulib files.
 }
 
 # Get gnulib files.


@@ -65,12 +64,9 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 

-    trap exit 1 2 13 15
-    trap 'rm -fr gnulib; exit 1' 0
-
-    case ${CVS_AUTH-anoncvs} in
-    anoncvs)
-      CVS_PREFIX='anoncvs@';;
+    case ${CVS_AUTH-pserver} in
+    pserver)
+      CVS_PREFIX=':pserver:anonymous@';;

     ssh)
       CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
     *)
     ssh)
       CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
     *)


@@ -82,9 +78,12 @@ case ${GNULIB_SRCDIR--} in
     '') export CVS_RSH=ssh;;
     esac
 
     '') export CVS_RSH=ssh;;
     esac
 

-    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+    trap cleanup_gnulib 1 2 13 15
+
+    cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib ||
+      cleanup_gnulib

 
 

-    trap - 0
+    trap - 1 2 13 15

   fi
   GNULIB_SRCDIR=gnulib
 esac
   fi
   GNULIB_SRCDIR=gnulib
 esac


@@ -92,7 +91,6 @@ esac
 <$GNULIB_SRCDIR/gnulib-tool || exit
 
 gnulib_modules='
 <$GNULIB_SRCDIR/gnulib-tool || exit
 
 gnulib_modules='

-alloca

 argmatch
 dirname
 error
 argmatch
 dirname
 error


@@ -109,7 +107,12 @@ quotearg
 stdbool
 stdio-safer
 stpcpy
 stdbool
 stdio-safer
 stpcpy

+strerror
+strtoul
+strverscmp

 unistd-safer
 unistd-safer

+unlocked-io
+verify

 xalloc
 xalloc-die
 xstrndup
 xalloc
 xalloc-die
 xstrndup


@@ -154,6 +157,8 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 

+# This suppresses a bogus diagnostic
+# "warning: macro `AM_LANGINFO_CODESET' not found in library".

 echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
 sed '
   /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
 echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
 sed '
   /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\