Updated

diff --git a/README-alpha b/README-alpha
index 4dd91bf285288080faf9330cf28468a7665a801d..605f2a7956866928a2d3eefaee10de2563f20d86 100644 (file)
--- a/README-alpha
+++ b/README-alpha
@@ -1,30 +1,62 @@
-This is a test release of GNU tar.
+This is GNU tar.
 
+This is a *pre-release* version, and not ready for production use yet.
 Please send comments and problem reports to <bug-tar@gnu.org>.
 
-       Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+If you have taken the sources from CVS you will need the following packages
+to build the package:
 
-       This file is part of GNU tar.
+autoconf 2.57
+automake 1.7.5
+bison 1.875
+gettext 0.12.1
+wget 1.7
 
-       GNU tar 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.
+Before building the package, run bootstrap. You will need a POSIX
+compliant shell to do so. The bootstrap utility obtains various
+additional files from the CVS repository and the Translation Project
+site and prepares the source directory for building. The exact way
+of invoking bootstrap depends on whether you have the sources for gnulib
+installed somewhere on your system and on the method you use to access
+the CVS at savannah.
 
-       GNU tar 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.
+If you already have gnulib sources on your machine, run:
 
-       You should have received a copy of the GNU General Public License
-       along with tar; see the file COPYING.  If not, write to
-       the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-       Boston, MA 02111-1307, USA.
+       ./bootstrap --gnulib-srcdir=DIRNAME
 
-This release was built with the following tools.  You probably need
-these tools (or later) if you want to hack seriously on it.
+Otherwise, if you have developer's access to savannah:
+
+a) if you access CVS via ssh, set the environment variable CVS_RSH
+to ssh and run ./bootstrap without arguments.
+
+b) if you access CVS via Kerberos, run
+
+        ./bootstrap --cvs-auth=gserver
+
+Othervise, if you are not a member of Savannah, run
+
+        ./bootstrap --cvs-auth=pserver
+
+When prompted for a password for anoncvs, simply press the Enter key. 
+
+\f
+
+Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+This file is part of GNU tar.
+
+GNU tar 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.
+
+GNU tar 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 tar; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
-autoconf 2.57
-automake 1.7.5
-bison 1.875
-gettext 0.12.1

diff --git a/bootstrap b/bootstrap
index 45a4b7969d7e3b880b71c9872e0c7bb6c1bb9d1f..35474081b870192fd3b076d2150d85514942ff4d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -27,16 +27,38 @@
 for option; do
   case $option in
   --help)
-    echo "$0: usage: $0 [--gnulib-srcdir=DIR]"
+    echo "$0: usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME]"
     exit;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+  --cvs-auth=*)
+    CVS_AUTH=`expr "$1" : '--cvs-auth=\(.*\)'`;;
+  --cvs-user=*)
+    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+build_cvs_prefix() {
+  CVS_PREFIX=:${1}:
+  if [ "${2}" != - ]; then
+    CVS_PREFIX=${CVS_PREFIX}${2}@
+  fi
+}
+
+case "${CVS_AUTH--}" in
+-)       : ${CVS_RSH:?}
+         CVS_PREFIX="";;
+pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs};;
+gserver|server)
+         build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+ext)     : ${CVS_RSH:?}
+         build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+*)       echo "$0: Unknown CVS access method" >&2
+         exit 1;;
+esac
 
 echo "$0: Bootstrapping CVS tar..."
 
@@ -50,7 +72,11 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     trap exit 1 2 13 15
     trap 'rm -fr gnulib; exit 1' 0
-    cvs -q -d savannah.gnu.org:/cvsroot/gnulib co gnulib  || exit
+    
+    if [ "${CVS_AUTH--}" = "pserver" ]; then
+      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib login || exit
+    fi
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib  || exit
     trap 0
   fi
   GNULIB_SRCDIR=gnulib