(seek_archive): New function

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index b1a2ee76c1c936e6958daa8640a79deba4673f12..7b355efa0db7f81951fd6c32548962da88a6a8ca 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -40,7 +40,8 @@ usage() {
  --cvs-user=USERNAME          Set the CVS username to be used when accessing
                               the gnulib repository.
  --no-po                      Do not download po files.
-
+ --update-po                  Update po files and exit.
+ 
 Running without arguments will suffice in most cases. It is equivalent
 to
 
@@ -49,6 +50,15 @@ to
 EOF
 }
 
+update_po() {
+  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
+}
+
 # Parse options.
 
 DOWNLOAD_PO=yes
@@ -66,12 +76,19 @@ do
     CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
   --no-po)
     DOWNLOAD_PO=no;;
+  --update-po)
+    DOWNLOAD_PO=only;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+if [ "$DOWNLOAD_PO" = "only" ]; then
+    update_po
+    exit 0
+fi     
+
 echo "$0: Bootstrapping CVS tar..."
 
 build_cvs_prefix() {
@@ -121,6 +138,7 @@ esac
 gnulib_modules='
 alloca
 argmatch
+argp
 backupfile
 dirname
 error
@@ -183,14 +201,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 &&
@@ -198,16 +219,35 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
+if [ -d patches ]; then
+    echo "$0: Patching gnulib"
+    for file in patches/*.diff
+    do
+      patch -p0 < $file
+    done
+fi
 
-# Get translations.
+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.
 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
+  update_po
 fi
 
 # Reconfigure, getting other files.