Synchronize with Gettext 0.13.1, Automake 1.8, Autoconf 2.59,

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 51f87528891e5ae6de64469b1306f477443c4d7a..dadb03045e1734dad6b00c519f1a7e9d2fd1dff0 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -24,33 +24,59 @@
 
 # Parse options.
 
-for option; do
+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
 
-
 echo "$0: Bootstrapping CVS tar..."
 
+build_cvs_prefix() {
+  CVS_PREFIX=:${1}:
+  if [ "${2}" != - ]; then
+    CVS_PREFIX=${CVS_PREFIX}${2}@
+  fi
+}
 
 # Get gnulib files.
 
-echo "$0: getting 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
-    cvs -q -d savannah.gnu.org:/cvsroot/gnulib co gnulib  || exit
+    
+    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
+    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
@@ -66,7 +92,7 @@ dirname
 error
 exclude
 fileblocks
-fnmatch
+fnmatch-gnu
 ftruncate
 full-write
 getdate
@@ -79,10 +105,10 @@ lchown
 memset
 modechange
 obstack
-safe-read
 quote
 quotearg
 rmdir
+safe-read
 save-cwd
 savedir
 stdbool
@@ -119,14 +145,6 @@ for gnulib_file in $gnulib_files; do
   dest=$gnulib_file
 
   case $gnulib_file in
-  m4/codeset.m4) continue;;
-  m4/glibc21.m4) continue;;
-  m4/intdiv0.m4) continue;;
-  m4/inttypes_h.m4) continue;;
-  m4/inttypes.m4) continue;;
-  m4/inttypes-pri.m4) continue;;
-  m4/isc-posix.m4) continue;;
-  m4/lcmessage.m4) continue;;
   m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
   esac
 
@@ -142,7 +160,7 @@ 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://www.iro.umontreal.ca/contrib/po/maint/tar/ &&
+   http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/ &&
  ls *.po | sed 's/\.po$//' >LINGUAS
 ) || exit
 
@@ -150,7 +168,7 @@ echo "$0: getting translations into po..."
 # Reconfigure, getting other files.
 
 echo "$0: autoreconf --verbose --install --force ..."
-autoreconf --verbose --install --force
+autoreconf --verbose --install --force || exit
 
 
 echo "$0: done.  Now you can run './configure'."