Get setenv module from gnulib

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index e45007503e052de757313fff3533cba00a5ff24e..519f5804fbcc352c01e2d904d28db9cad90284f9 100755 (executable)
--- 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
@@ -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,14 +65,15 @@ update_po() {
     case $1 in
     *.po)  POFILE=$1;;
     *)     POFILE=${1}.po;;
-    esac       
+    esac
     echo "$0: getting translation for $1..."
-    wget -C off $TP_URL/$POFILE
+    wget -r -C off $TP_URL/$POFILE
   else
     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 &&
+      rm -f index.html index.html.[0-9]*
       ls *.po | sed 's/\.po$//' >LINGUAS
     ) || exit
   fi
@@ -112,7 +113,7 @@ only)       update_po
        exit 0
        ;;
 no|yes) ;;
-*)     update_po $DOWNLOAD_PO 
+*)     update_po $DOWNLOAD_PO
        exit 0
 esac
 
@@ -201,6 +202,7 @@ rmdir
 safe-read
 save-cwd
 savedir
+setenv
 stdbool
 stpcpy
 strtol
@@ -217,6 +219,8 @@ xstrtoumax
 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
@@ -268,14 +272,15 @@ 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 
+# Get paxutils files
 case ${PAXUTILS_SRCDIR--} in
 -) checkout paxutils
    PAXUTILS_SRCDIR=paxutils
@@ -288,12 +293,18 @@ copy_files() {
     case $file in
     "#*")  continue;;
     esac
-    echo "$0: Copying file $1/$file" 
+    echo "$0: Copying file $1/$file"
     cp -p $1/$file $2/`expr $file : '.*/\(.*\)'`
   done
 }
 
-copy_files ${PAXUTILS_SRCDIR}/m4 m4 
+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
    :
@@ -301,7 +312,7 @@ else
    mkdir rmt
 fi
 
-copy_files ${PAXUTILS_SRCDIR}/rmt rmt 
+copy_files ${PAXUTILS_SRCDIR}/rmt rmt
 
 copy_files ${PAXUTILS_SRCDIR}/lib lib
 
@@ -315,7 +326,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'."