Get files from the gnulib and po repositories, instead of relying

on them being in our CVS.  Upgrade to latest versions of gnulib and Automake.

1 files changed, 220 insertions, 3 deletions

diff --git a/bootstrap b/bootstrap
index c27557b5..fe24200e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,223 @@
 #! /bin/sh
 
-echo "Bootstrapping CVS Bison..."
+# Bootstrap this package from CVS.
 
-echo "running: autoreconf --verbose --install --force"
-autoreconf --verbose --install --force
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Written by Paul Eggert.
+
+package=bison
+
+# Parse options.
+
+for option
+do
+  case $option in
+  --help)
+    echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]"
+    exit;;
+  --gnulib-srcdir=*)
+    GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+  --cvs-user=*)
+    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
+  --skip-po)
+    SKIP_PO=t;;
+  *)
+    echo >&2 "$0: $option: unknown option"
+    exit 1;;
+  esac
+done
+
+echo "$0: Bootstrapping CVS $package..."
+
+build_cvs_prefix() {
+  CVS_PREFIX=:${1}:
+  if [ "${2}" != - ]; then
+    CVS_PREFIX=${CVS_PREFIX}${2}@
+  fi
+}
+
+# Get gnulib files.
+
+case ${GNULIB_SRCDIR--} in
+-)
+  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@';;
+    ssh)
+      CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
+    *)
+      echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
+      exit 1;;
+    esac
+
+    case $CVS_RSH in
+    '') export CVS_RSH=ssh;;
+    esac
+
+    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+
+    trap 0
+  fi
+  GNULIB_SRCDIR=gnulib
+esac
+
+<$GNULIB_SRCDIR/gnulib-tool || exit
+
+gnulib_modules='
+alloca
+argmatch
+dirname
+error
+getopt
+hard-locale
+hash
+malloc
+mbswidth
+obstack
+quote
+quotearg
+stdbool
+stpcpy
+xalloc
+xstrndup
+'
+
+previous_gnulib_modules=
+while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
+  previous_gnulib_modules=$gnulib_modules
+  gnulib_modules=`
+    (echo "$gnulib_modules"
+     for gnulib_module in $gnulib_modules; do
+       $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
+     done) | sort -u
+  `
+done
+
+gnulib_files=`
+  (for gnulib_module in $gnulib_modules; do
+     $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+   done) | sort -u
+`
+
+gnulib_dirs=`echo "$gnulib_files" | sed 's,/[^/]*$,,' | sort -u`
+mkdir -p $gnulib_dirs || exit
+
+for gnulib_file in $gnulib_files; do
+  dest=$gnulib_file
+
+  case $gnulib_file in
+  m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
+  esac
+
+  rm -f $dest &&
+  echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
+  cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
+done
+
+
+# Get translations.
+
+case $SKIP_PO in
+'')
+  echo "$0: getting translations into po..."
+  (cd po &&
+   rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
+   wget -nv -nd -r -l 1 -A .po -C off \
+     http://www2.iro.umontreal.ca/~gnutra/po/maint/$package/ &&
+   ls *.po | sed 's/\.po$//' >LINGUAS
+  ) || exit;;
+esac
+
+
+# Generate autoconf and automake snippets.
+
+(echo '# This file is generated automatically by "bootstrap".' &&
+ echo 'AC_DEFUN([GNULIB_AUTOCONF_SNIPPET],[' &&
+ $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_modules &&
+ echo '])'
+) >m4/gnulib.m4 || exit
+
+(echo '# This file is generated automatically by "bootstrap".' &&
+ $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_modules
+) >lib/gnulib.mk || exit
+
+
+# Reconfigure, getting other files.
+
+echo "$0: autoreconf --verbose --install --force ..."
+autoreconf --verbose --install --force || exit
+
+# We don't need intl, so remove it.
+echo "$0: rm -fr intl ..."
+rm -fr intl || exit
+
+
+# Patch what appears to be a bug in gettext 0.14.1;
+# remove this once the bug is fixed.
+grep @top_builddir@ po/Makefile.in.in >/dev/null || {
+  echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... "
+  old_contents=$(cat po/Makefile.in.in) || exit
+  cat >po/Makefile.in.in <<EOF
+top_builddir=@top_builddir@
+$old_contents
+EOF
+}
+
+# Put bug-reporting address into po/Makevars.
+echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
+sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars
+
+
+# if src/parse-gram.[ch] are out of date, rebuild them.
+parse_gram_y=$(find src/parse-gram.y \
+		 '(' -newer src/parse-gram.c -o -newer src/parse-gram.h ')' \
+		 -print) || exit
+case $parse_gram_y in
+?*)
+  echo "$0: warning: bootstrapping with old src/parse-gram.[ch] files."
+
+  echo "$0: touch -c src/parse-gram.[ch] ... "
+  touch -c src/parse-gram.[ch] || exit
+
+  echo "$0: ./configure --disable-nls ..."
+  ./configure --disable-nls || exit
+
+  echo "$0: (cd lib && make) ..."
+  (cd lib && make) || exit
+
+  echo "$0: (cd src && make) ..."
+  (cd src && make) || exit
+
+  echo "$0: rm -f src/parse-gram.c src/parse-gram.h ..."
+  rm -f src/parse-gram.c src/parse-gram.h || exit
+
+  echo "$0: (cd src && make parse-gram.c parse-gram.h) ..."
+  (cd src && make parse-gram.c parse-gram.h) || exit
+
+  echo "$0: make distclean ..."
+  make distclean || exit;;
+esac
+
+echo "$0: done.  Now you can run './configure'."