* bootstrap: Adjust to today's change to gnulib-tool by invoking

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 64b68a55fd275da3082e3ecc0fe748e22d81789c..5c42b3426d6c4ef728da467aa760bfda9a701740 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -71,7 +71,13 @@ update_po() {
     *)     POFILE=${1}.po;;
     esac
     echo "$0: getting translation for $1..."
-    wget -r --cache=off $TP_URL/$POFILE
+    (cd po;
+     wget -r --cache=off -O $POFILE $TP_URL/$POFILE || exit
+     LANG=`expr $POFILE : '\(.*\)\.po'`
+     if ! grep -q $LANG LINGUAS; then
+       mv LINGUAS LINGUAS.$$
+       (echo $LANG; cat LINGUAS.$$) | sort > LINGUAS
+     fi)
   else
     echo "$0: getting translations into po..."
     (cd po &&
@@ -237,6 +243,7 @@ case ${GNULIB_SRCDIR--} in
 esac
 
 <$GNULIB_SRCDIR/gnulib-tool || exit
+gnulib_tool="$GNULIB_SRCDIR/gnulib-tool --assume-autoconf=latest-stable"
 
 get_modules gnulib.modules
 
@@ -247,14 +254,14 @@ while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   gnulib_modules=`
     (echo "$gnulib_modules"
      for gnulib_module in $gnulib_modules; do
-       $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
+       $gnulib_tool --extract-dependencies $gnulib_module
      done) | sort -u
   `
 done
 
 gnulib_files=`
   (for gnulib_module in $gnulib_modules; do
-     $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+     $gnulib_tool --extract-filelist $gnulib_module
    done) | sort -u
 `
 
@@ -290,7 +297,7 @@ echo "$0: Creating m4/gnulib.m4"
  echo "AC_DEFUN([tar_GNULIB],["
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
-    $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
+    $gnulib_tool --extract-autoconf-snippet $gnulib_module
  done | sed '/AM_GNU_GETTEXT/d'
  echo "])") > ./m4/gnulib.m4
 
@@ -300,7 +307,7 @@ echo "$0: Creating lib/Makefile.am"
 
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
-    $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
+    $gnulib_tool --extract-automake-snippet $gnulib_module
  done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
 
 # Get translations.