11 files changed, 786 insertions, 437 deletions

diff --git a/.gitignore b/.gitignore
index f1bcbd1..ea5bcba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,9 +25,7 @@ config.status
 configure
 core
 gnu
-gnulib
 lib
 m4
-paxutils
 rmt
 stamp-h1
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1dc373d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "gnulib"]
+        path = gnulib
+        url = git://git.sv.gnu.org/gnulib.git
+[submodule "paxutils"]
+        path = paxutils
+        url = git://git.sv.gnu.org/paxutils.git
diff --git a/README-hacking b/README-hacking
index 4b15efc..4471e91 100644
--- a/README-hacking
+++ b/README-hacking
@@ -12,7 +12,6 @@ version.
 - Autoconf <http://www.gnu.org/software/autoconf/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
-- Gnulib <http://www.gnu.org/software/gnulib> 
 - Git <http://git.or.cz>
 
 * Bootstrapping
@@ -33,23 +32,14 @@ Once done, proceed as described in the file README (section
 INSTALLATION).
 
 Normally you will have to run bootstrap only once. However, if you
-intend to hack on GNU cpio, you might need to run it again later. In
-this case, you will probably want to save some time and bandwidth by
-avoiding downloading the same files again. If so, create in GNU cpio
-root directory the file named `.bootstrap' with the following
-contents:
-
-   --gnulib-srcdir=$HOME/gnulib --paxutils-srcdir=$HOME/paxutils
-
-Replace `$HOME/gnulib' and $HOME/paxutils with the actual directory
-where the Gnulib and Paxutils sources reside.
-   
-For more information about `bootstrap', run `bootstrap --help'.
+intend to hack on GNU cpio, you might need to run it again later.
+There are several options that you may find useful in this case.
+See 'bootstrap --help' for a detailed list.
 
 
 * Copyright information
 
- Copyright (C) 2007-2010, 2014 Free Software Foundation, Inc.
+ Copyright (C) 2007-2010, 2014-2015 Free Software Foundation, Inc.
 
  Permission is granted to anyone to make or distribute verbatim copies
  of this document as received, in any medium, provided that the
diff --git a/bootstrap b/bootstrap
index aeb46e0..5e318e4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,10 @@
 #! /bin/sh
+# Print a version string.
+scriptversion=2015-08-24.08; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2010, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015 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
@@ -17,7 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Written by Paul Eggert and Sergey Poznyakoff.
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project.  The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
 
 nl='
 '
@@ -26,41 +36,77 @@ nl='
 LC_ALL=C
 export LC_ALL
 
+# Ensure that CDPATH is not set.  Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 local_gl_dir=gl
 
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
+# Honour $PERL, but work even if there is none
+PERL="${PERL-perl}"
+
+me=$0
 
 usage() {
-  echo >&2 "\
-Usage: $0 [OPTION]...
+  cat <<EOF
+Usage: $me [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Options:
- --paxutils-srcdir=DIRNAME  Specify the local directory where paxutils
-                          sources reside. Use this if you already
-                          have paxutils sources on your machine, and
-                          do not want to waste your bandwidth dowloading
-                          them again.
- --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
+ --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 downloading
-                          them again.
- --copy                   Copy files instead of creating symbolic links.
- --force                  Attempt to bootstrap even if the sources seem
-                          not to have been checked out.
- --skip-po                Do not download po files.
-
-If the file $0.conf exists in the same directory as this script, its
+                          them again.  Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync         if this bootstrap script is not identical to
+                          the version in the local gnulib sources,
+                          update this script, and then restart it with
+                          /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync      do not check whether bootstrap is out of sync
+ --copy                   copy files instead of creating symbolic links
+ --force                  attempt to bootstrap even if the sources seem
+                          not to have been checked out
+ --no-git                 do not use git to update gnulib.  Requires that
+                          --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po                do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
 Running without arguments will suffice in most cases.
-"
+EOF
 }
 
+# warnf_ FORMAT-STRING ARG1...
+warnf_ ()
+{
+  warnf_format_=$1
+  shift
+  nl='
+'
+  case $* in
+    *$nl*) me_=$(printf "$me"|tr "$nl|" '??')
+       printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
+    *) printf "$me: $warnf_format_" "$@" ;;
+  esac >&2
+}
+
+# warn_ WORD1...
+warn_ ()
+{
+  # If IFS does not start with ' ', set it and emit the warning in a subshell.
+  case $IFS in
+    ' '*) warnf_ '%s\n' "$*";;
+    *)    (IFS=' '; warn_ "$@");;
+  esac
+}
+
+# die WORD1...
+die() { warn_ "$@"; exit 1; }
+
 # Configuration.
 
 # Name of the Makefile.am
@@ -72,18 +118,51 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+: ${AUTOPOINT=autopoint}
+: ${AUTORECONF=autoreconf}
+
+# A function to be called right after gnulib-tool is run.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_post_import_hook() { :; }
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
 # the second with the destination directory.  Use rsync's -L and -r
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
-
-extract_package_name='divert(-1)[]changequote([,])[]define([AC_INIT],[divert(0)[]patsubst([$1],[GNU ],[])[]divert(-1)])'
-
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
+
+# Fallback for downloading .po files (if rsync fails).