X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=bootstrap;h=bd0939a16e79d458e4e2da52d0a014881201be46;hb=67c7284d07f9b8de0c0d46c6e8134b856b5fe213;hp=dac36e7d079cb160f98d8281baf3c316bdf2128a;hpb=7c3510b40d70c30316cae119f59069d74d407a3e;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index dac36e7..bd0939a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 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
@@ -22,7 +22,7 @@
 # Written by Paul Eggert and Sergey Poznyakoff.
 
 # URL of our text domain page in Translation Project
-TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/"
+TP_URL="http://www.iro.umontreal.ca/translation/maint/tar/"
 
 # Ensure file names are sorted consistently across platforms;
 # e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
@@ -51,7 +51,7 @@ usage() {
                               the gnulib repository.
  --no-po                      Do not download po files.
  --update-po[=LANG]           Update po file(s) and exit.
- 
+
 Running without arguments will suffice in most cases. It is equivalent
 to
 
@@ -65,7 +65,7 @@ update_po() {
     case $1 in
     *.po)  POFILE=$1;;
     *)     POFILE=${1}.po;;
-    esac	
+    esac
     echo "$0: getting translation for $1..."
     wget -r -C off $TP_URL/$POFILE
   else
@@ -113,7 +113,7 @@ only)	update_po
 	exit 0
 	;;
 no|yes) ;;
-*)	update_po $DOWNLOAD_PO 
+*)	update_po $DOWNLOAD_PO
 	exit 0
 esac
 
@@ -158,10 +158,60 @@ checkout() {
     fi
     cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
 
-    trap 0
+    trap - 0
   fi
 }
 
+# Prepare temporary module list
+cat /dev/null > modlist.tmp
+trap 'rm -f modlist.tmp' 0 1 2 13 15
+
+get_modules() {
+	sed '/^[ 	]*#/d;/^[ 	]*$/d' $* >> modlist.tmp
+}
+
+# Get paxutils files
+case ${PAXUTILS_SRCDIR--} in
+-) checkout paxutils
+   PAXUTILS_SRCDIR=paxutils
+esac
+
+if [ -r $PAXUTILS_SRCDIR/gnulib.modules ]; then
+  get_modules $PAXUTILS_SRCDIR/gnulib.modules
+fi
+
+# copy_files srcdir dstdir
+copy_files() {
+  for file in `cat $1/DISTFILES`
+  do
+    case $file in
+    "#*")  continue;;
+    esac
+    echo "$0: Copying file $1/$file"
+    cp -p $1/$file $2/`expr $file : '.*/\(.*\)'`
+  done
+}
+
+copy_files ${PAXUTILS_SRCDIR}/m4 m4
+echo "$0: Creating m4/paxutils.m4"
+(echo "# This file is generated automatically. Please, do not edit."
+ echo "#"
+ echo "AC_DEFUN([tar_PAXUTILS],["
+ cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
+ echo "])") > ./m4/paxutils.m4
+
+if [ -d rmt ]; then
+   :
+else
+   mkdir rmt
+fi
+
+copy_files ${PAXUTILS_SRCDIR}/rmt rmt
+
+copy_files ${PAXUTILS_SRCDIR}/lib lib
+
+copy_files ${PAXUTILS_SRCDIR}/tests tests
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
@@ -171,60 +221,17 @@ esac
 
 <$GNULIB_SRCDIR/gnulib-tool || exit
 
-gnulib_modules='
-alloca
-argmatch
-argp
-backupfile
-dirname
-error
-exclude
-fileblocks
-fnmatch-gnu
-ftruncate
-full-write
-getdate
-getline
-getopt
-getpagesize
-gettext
-gettime
-hash
-human
-lchown
-localcharset
-memset
-modechange
-obstack
-quote
-quotearg
-rmdir
-safe-read
-save-cwd
-savedir
-stdbool
-stpcpy
-strtol
-strtoul
-timespec
-unlocked-io
-utime
-xalloc
-xalloc-die
-xgetcwd
-xstrtoumax
-'
+get_modules gnulib.modules
 
+gnulib_modules=`sort -u modlist.tmp`
 previous_gnulib_modules=
 while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   previous_gnulib_modules=$gnulib_modules
-  # In gnulib `alloca-opt' duplicates `alloca', so make sure not
-  # to use it.
   gnulib_modules=`
     (echo "$gnulib_modules"
      for gnulib_module in $gnulib_modules; do
        $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
-     done) | sed 's/alloca-opt/alloca/' | sort -u
+     done) | sort -u
   `
 done
 
@@ -271,45 +278,14 @@ echo "$0: Creating m4/gnulib.m4"
  echo "])") > ./m4/gnulib.m4
 
 echo "$0: Creating lib/Makefile.am"
-(cat lib/Makefile.tmpl
- 
+(echo "# This file is generated automatically from lib/Makefile.am. Do not edit!"
+ 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 paxutils files 
-case ${PAXUTILS_SRCDIR--} in
--) checkout paxutils
-   PAXUTILS_SRCDIR=paxutils
-esac
-
-# copy_files srcdir dstdir
-copy_files() {
-  for file in `cat $1/DISTFILES`
-  do
-    case $file in
-    "#*")  continue;;
-    esac
-    echo "$0: Copying file $1/$file" 
-    cp -p $1/$file $2/`expr $file : '.*/\(.*\)'`
-  done
-}
-
-copy_files ${PAXUTILS_SRCDIR}/m4 m4 
-
-if [ -d rmt ]; then
-   :
-else
-   mkdir rmt
-fi
-
-copy_files ${PAXUTILS_SRCDIR}/rmt rmt 
-
-copy_files ${PAXUTILS_SRCDIR}/lib lib
-
-copy_files ${PAXUTILS_SRCDIR}/tests tests
-
 # Get translations.
 if test "$DOWNLOAD_PO" = "yes"; then
   update_po
@@ -318,7 +294,7 @@ fi
 # Reconfigure, getting other files.
 
 echo "$0: autoreconf --verbose --install --force ..."
-autoreconf --verbose --install --force
+autoreconf --verbose --install --force || exit 1
 
 
 echo "$0: done.  Now you can run './configure'."