X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=bootstrap;h=e4068f6874d85132062175700652a15e87d54a16;hb=4c004cff39d10f1b7744aaec1c9eb85c9cfb3c56;hp=4fd76d369c80223039c4d058e9585087b3266d14;hpb=659f70a38acb236b55ea98863761f9b29a162b08;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index 4fd76d3..e4068f6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# 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
@@ -21,20 +21,51 @@
 
 # Written by Paul Eggert.
 
+# URL of our text domain page in Translation Project
+TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/"
+
+usage() {
+ cat <<EOF
+ usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po]
+ Options are:
+ --gnulib-srcdir=DIRNAME      Specify the local directory where gnulib
+                              sources reside. Use this if you already
+                              have gnulib sources on your machine, and
+                              do not want to waste your bandwidth dowloading
+                              them again.
+ --cvs-auth=METHOD            Set the CVS access method used for downloading
+                              gnulib files. METHOD is one of the keywords
+                              accepted by cvs -d option (see info cvs
+                              repository).
+ --cvs-user=USERNAME          Set the CVS username to be used when accessing
+                              the gnulib repository.
+ --no-po                      Do not download po files.
+
+Running without arguments will suffice in most cases. It is equivalent
+to
+
+    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+
+EOF
+}
 
 # Parse options.
 
-for option; do
+DOWNLOAD_PO=yes
+for option
+do
   case $option in
   --help)
-    echo "$0: usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME]"
+    usage
     exit;;
   --gnulib-srcdir=*)
-    GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
   --cvs-auth=*)
-    CVS_AUTH=`expr "$1" : '--cvs-auth=\(.*\)'`;;
+    CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;;
   --cvs-user=*)
-    CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
+    CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
+  --no-po)
+    DOWNLOAD_PO=no;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
@@ -48,6 +79,12 @@ build_cvs_prefix() {
   if [ "${2}" != - ]; then
     CVS_PREFIX=${CVS_PREFIX}${2}@
   fi
+  if [ "$1" = "ext" ]; then
+    if [ -z "${CVS_RSH}" ]; then
+       CVS_RSH=ssh
+       export CVS_RSH
+    fi
+  fi
 }
 
 # Get gnulib files.
@@ -59,17 +96,15 @@ case ${GNULIB_SRCDIR--} in
 
     trap exit 1 2 13 15
     trap 'rm -fr gnulib; exit 1' 0
-    
+
     case "${CVS_AUTH--}" in
-    -)       : ${CVS_RSH:?}
-             CVS_PREFIX="";;
+    -)       build_cvs_prefix ext anoncvs;;
     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--};;
+	     build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+    ext)     build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
     *)       echo "$0: Unknown CVS access method" >&2
-             exit 1;;
+	     exit 1;;
     esac
     if [ "${CVS_AUTH--}" = "pserver" ]; then
       cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib login || exit
@@ -98,6 +133,7 @@ getdate
 getline
 getopt
 gettext
+gettime
 hash
 human
 lchown
@@ -111,8 +147,10 @@ safe-read
 save-cwd
 savedir
 stdbool
+stpcpy
 strtol
 strtoul
+timespec
 unlocked-io
 utime
 xalloc
@@ -145,14 +183,17 @@ for gnulib_file in $gnulib_files; do
 
   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;;
+  # These will be overwritten by autopoint, which still uses
+  # old jm_.* macro names, so we have to keep both copies.
+  m4/ulonglong.m4) dest=m4/ulonglong_gl.m4;;
+  m4/inttypes_h.m4) dest=m4/inttypes_h_gl.m4;;
+  m4/stdint_h.m4) dest=m4/stdint_h_gl.m4;;
+  m4/uintmax_t.m4) dest=m4/uintmax_t_gl.m4;;
   esac
 
   rm -f $dest &&
@@ -160,17 +201,34 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
+echo "$0: Creating m4/gnulib.m4"
+(echo "# This file is generated automatically. Please, do not edit."
+ echo "#"
+ echo "AC_DEFUN([tar_GNULIB],["
+ for gnulib_module in $gnulib_modules; do
+    echo "# $gnulib_module"
+    $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
+ done | sed '/AM_GNU_GETTEXT/d'
+ echo "])") > ./m4/gnulib.m4
+
+echo "$0: Creating lib/Makefile.am"
+(cat lib/Makefile.tmpl
+ 
+ for gnulib_module in $gnulib_modules; do
+    echo "# $gnulib_module"
+    $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
+ done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
 
 # Get translations.
 
-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/ &&
- ls *.po | sed 's/\.po$//' >LINGUAS
-) || exit
-
+if test "$DOWNLOAD_PO" = "yes"; then
+  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 $TP_URL &&
+    ls *.po | sed 's/\.po$//' >LINGUAS
+  ) || exit
+fi
 
 # Reconfigure, getting other files.