diff --git a/bootstrap b/bootstrap
index 2fdf2674..a3d98ce9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2017-09-13.06; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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 +17,7 @@ scriptversion=2014-12-08.12; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Originally written by Paul Eggert. The canonical version of this
# script is maintained as build-aux/bootstrap in gnulib, however, to
@@ -42,7 +42,7 @@ export LC_ALL
local_gl_dir=gl
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
PERL="${PERL-perl}"
me=$0
@@ -141,7 +141,7 @@ po_download_command_format=\
# Fallback for downloading .po files (if rsync fails).
po_download_command_format2=\
"wget --mirror -nd -q -np -A.po -P '%s' \
- http://translationproject.org/latest/%s/"
+ https://translationproject.org/latest/%s/"
# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
# fall back to the package name (1st argument with munging)
@@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available
done
}
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
+
+# Skip lines that do not start with version.
+/^[0-9]/!d
+
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
+
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
+
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
+
get_version() {
app=$1
$app --version >/dev/null 2>&1 || { $app --version; return 1; }
- $app --version 2>&1 |
- sed -n '# Move version to start of line.
- s/.*[v ]\([0-9]\)/\1/
-
- # Skip lines that do not start with version.
- /^[0-9]/!d
-
- # Remove characters after the version.
- s/[^.a-z0-9-].*//
-
- # The first component must be digits only.
- s/^\([0-9]*\)[a-z-].*/\1/
-
- #the following essentially does s/5.005/5.5/
- s/\.0*\([1-9]\)/.\1/g
- p
- q'
+ $app --version 2>&1 | sed -n "$get_version_sed"
}
check_versions() {
@@ -788,9 +790,9 @@ symlink_to_dir()
# Leave any existing symlink alone, if it already points to the source,
# so that broken build tools that care about symlink times
# aren't confused into doing unnecessary builds. Conversely, if the
- # existing symlink's time stamp is older than the source, make it afresh,
+ # existing symlink's timestamp is older than the source, make it afresh,
# so that broken tools aren't confused into skipping needed builds. See
- # .
+ # .
test -h "$dst" &&
src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
@@ -915,7 +917,8 @@ if test $use_libtool = 1; then
esac
fi
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file \
@@ -1020,6 +1023,6 @@ echo "$0: done. Now you can run './configure'."
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 2c8b6fe1..0d8a2b30 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,6 +1,4 @@
/announce-gen
-/arg-nonnull.h
-/c++defs.h
/compile
/config.guess
/config.rpath
@@ -16,14 +14,12 @@
/install-sh
/javacomp.sh.in
/javaexec.sh.in
-/link-warning.h
/mdate-sh
/missing
+/prefix-gnulib-mk
/test-driver
/texinfo.tex
/update-copyright
/useless-if-before-free
/vc-list-files
-/warn-on-use.h
/ylwrap
-/prefix-gnulib-mk
diff --git a/build-aux/snippet/.gitignore b/build-aux/snippet/.gitignore
deleted file mode 100644
index 2a3a2f91..00000000
--- a/build-aux/snippet/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/_Noreturn.h
-/arg-nonnull.h
-/c++defs.h
-/warn-on-use.h
diff --git a/lib/.gitignore b/lib/.gitignore
index 4815b9e1..4e8c029a 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -4,8 +4,7 @@
/*~
/.deps
/.dirstamp
-/Makefile
-/Makefile.in
+/_Noreturn.h
/alignof.h
/alloca.h
/alloca.in.h
@@ -15,7 +14,9 @@
/asnprintf.c
/basename-lgpl.c
/basename.c
+/binary-io.c
/binary-io.h
+/bitrotate.c
/bitrotate.h
/c++defs.h
/c-ctype.c
@@ -28,8 +29,6 @@
/charset.alias
/cloexec.c
/cloexec.h
-/close-hook.c
-/close-hook.h
/close-stream.c
/close-stream.h
/close.c
@@ -56,7 +55,6 @@
/exitfail.h
/fatal-signal.c
/fatal-signal.h
-/fclose.c
/fcntl.c
/fcntl.h
/fcntl.in.h
@@ -81,19 +79,27 @@
/fseterr.h
/fstat.c
/getdtablesize.c
+/getopt-cdefs.in.h
+/getopt-core.h
+/getopt-ext.h
+/getopt-pfx-core.h
+/getopt-pfx-ext.h
/getopt.c
/getopt.h
/getopt.in.h
/getopt1.c
/getopt_int.h
+/getprogname.c
+/getprogname.h
/gettext.h
/gnulib.mk
+/hard-locale.c
+/hard-locale.h
/hash.c
/hash.h
/intprops.h
/inttypes.h
/inttypes.in.h
-/ioctl.c
/isnan.c
/isnand-nolibm.h
/isnand.c
@@ -103,9 +109,16 @@
/isnanl.c
/itold.c
/ldexpl.c
+/limits.h
+/limits.in.h
/localcharset.c
/localcharset.h
+/lstat.c
/malloc.c
+/malloca.c
+/malloca.h
+/malloca.valgrind
+/math.c
/math.h
/math.in.h
/mbrtowc.c
@@ -114,12 +127,11 @@
/mbswidth.h
/memchr.c
/memchr.valgrind
+/minmax.h
/msvc-inval.c
/msvc-inval.h
/msvc-nothrow.c
/msvc-nothrow.h
-/nonblocking.c
-/nonblocking.h
/obstack.c
/obstack.h
/obstack_printf.c
@@ -140,7 +152,6 @@
/printf.c
/progname.c
/progname.h
-/quote.c
/quote.h
/quotearg.c
/quotearg.h
@@ -154,6 +165,7 @@
/ref-del.sin
/sched.h
/sched.in.h
+/sig-handler.c
/sig-handler.h
/sigaction.c
/signal.h
@@ -182,6 +194,8 @@
/spawnp.c
/sprintf.c
/stamp-h1
+/stat-w32.c
+/stat-w32.h
/stat.c
/stdbool.h
/stdbool.in.h
@@ -192,7 +206,6 @@
/stdio--.h
/stdio-impl.h
/stdio-safer.h
-/stdio-write.c
/stdio.h
/stdio.in.h
/stdlib.h
@@ -213,20 +226,18 @@
/strnlen.c
/strverscmp.c
/sys
-/sys_ioctl.h
/sys_ioctl.in.h
-/sys_socket.h
/sys_socket.in.h
-/sys_stat.h
/sys_stat.in.h
+/sys_time.in.h
/sys_types.in.h
-/sys_wait.h
/sys_wait.in.h
/sysexits.in.h
/time.h
/time.in.h
/unistd--.h
/unistd-safer.h
+/unistd.c
/unistd.h
/unistd.in.h
/unitypes.h
@@ -234,6 +245,7 @@
/uniwidth
/uniwidth.h
/uniwidth.in.h
+/unlink.c
/unlocked-io.h
/unsetenv.c
/vasnprintf.c
@@ -242,7 +254,6 @@
/vfprintf.c
/vsnprintf.c
/vsprintf.c
-/w32sock.h
/w32spawn.h
/wait-process.c
/wait-process.h
@@ -250,6 +261,7 @@
/warn-on-use.h
/wchar.h
/wchar.in.h
+/wctype-h.c
/wctype.h
/wctype.in.h
/wcwidth.c
@@ -260,17 +272,7 @@
/xmalloc.c
/xmemdup0.c
/xmemdup0.h
+/xsize.c
/xsize.h
/xstrndup.c
/xstrndup.h
-/binary-io.c
-/xsize.c
-/bitrotate.c
-/math.c
-/sig-handler.c
-/unistd.c
-/wctype-h.c
-/lstat.c
-/unlink.c
-/gettimeofday.c
-/sys_time.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 5715c35c..4061237c 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,10 +1,10 @@
+/*~
/00gnulib.m4
+/absolute-header.m4
/alloca.m4
-/argmatch.m4
/asm-underscore.m4
/assert.m4
/calloc.m4
-/cloexec.m4
/close-stream.m4
/close.m4
/closeout.m4
@@ -12,9 +12,9 @@
/config-h.m4
/configmake.m4
/dirname.m4
-/dos.m4
/double-slash-root.m4
/dup2.m4
+/eealloc.m4
/environ.m4
/errno_h.m4
/error.m4
@@ -22,8 +22,8 @@
/exponentf.m4
/exponentl.m4
/extensions.m4
+/extern-inline.m4
/fatal-signal.m4
-/fclose.m4
/fcntl-o.m4
/fcntl.m4
/fcntl_h.m4
@@ -38,6 +38,7 @@
/fstat.m4
/getdtablesize.m4
/getopt.m4
+/getprogname.m4
/gettext.m4
/glibc2.m4
/glibc21.m4
@@ -45,12 +46,11 @@
/gnulib-common.m4
/gnulib-comp.m4
/gnulib-tool.m4
-/hash.m4
+/hard-locale.m4
/iconv.m4
/include_next.m4
/intdiv0.m4
/intl.m4
-/intl.m4~
/intldir.m4
/intlmacosx.m4
/intmax.m4
@@ -58,7 +58,6 @@
/inttypes-pri.m4
/inttypes.m4
/inttypes_h.m4
-/ioctl.m4
/isnan.m4
/isnand.m4
/isnanf.m4
@@ -73,19 +72,23 @@
/lib-link.m4
/lib-prefix.m4
/libunistring-base.m4
+/limits-h.m4
/localcharset.m4
/locale-fr.m4
/locale-ja.m4
/locale-zh.m4
/lock.m4
/longlong.m4
+/lstat.m4
/malloc.m4
+/malloca.m4
/math_h.m4
/mbrtowc.m4
/mbsinit.m4
/mbstate_t.m4
/mbswidth.m4
/memchr.m4
+/minmax.m4
/mmap-anon.m4
/mode_t.m4
/msvc-inval.m4
@@ -93,13 +96,16 @@
/multiarch.m4
/nls.m4
/nocrash.m4
+/non-recursive-gnulib-prefix-hack.m4
+/obstack-printf.m4
+/obstack.m4
/off_t.m4
+/open-cloexec.m4
/open.m4
/pathmax.m4
/perror.m4
/pipe2.m4
/po.m4
-/po.m4~
/posix_spawn.m4
/printf-frexp.m4
/printf-frexpl.m4
@@ -107,6 +113,7 @@
/printf-posix.m4
/printf.m4
/progtest.m4
+/pthread_rwlock_rdlock.m4
/quote.m4
/quotearg.m4
/raise.m4
@@ -122,8 +129,6 @@
/size_max.m4
/snprintf-posix.m4
/snprintf.m4
-/socklen.m4
-/sockpfaf.m4
/spawn-pipe.m4
/spawn_h.m4
/sprintf-posix.m4
@@ -133,7 +138,6 @@
/stddef_h.m4
/stdint.m4
/stdint_h.m4
-/stdio-safer.m4
/stdio_h.m4
/stdlib_h.m4
/stpcpy.m4
@@ -145,17 +149,16 @@
/strndup.m4
/strnlen.m4
/strverscmp.m4
-/sys_ioctl_h.m4
/sys_socket_h.m4
/sys_stat_h.m4
/sys_types_h.m4
/sys_wait_h.m4
-/sysexits.m4
/threadlib.m4
/time_h.m4
/uintmax_t.m4
/unistd-safer.m4
/unistd_h.m4
+/unlink.m4
/unlocked-io.m4
/vasnprintf.m4
/vfprintf-posix.m4
@@ -175,12 +178,3 @@
/xalloc.m4
/xsize.m4
/xstrndup.m4
-/obstack-printf.m4
-/extern-inline.m4
-/non-recursive-gnulib-prefix-hack.m4
-/absolute-header.m4
-/lstat.m4
-/unlink.m4
-/gettimeofday.m4
-/obstack.m4
-/sys_time_h.m4
diff --git a/po/.gitignore b/po/.gitignore
index 940ce9ef..e2218710 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,12 +1,11 @@
+/*~
/*.gmo
/*.po
-/*.po~
/.reference
/LINGUAS
/Makefile
/Makefile.in
/Makefile.in.in
-/Makefile.in.in~
/Makevars
/Makevars.template
/POTFILES
@@ -15,7 +14,6 @@
/boldquot.sed
/en@boldquot.header
/en@quot.header
-/insert-header.sed
/insert-header.sin
/quot.sed
/remove-potcdate.sed
diff --git a/runtime-po/.gitignore b/runtime-po/.gitignore
index 8675428f..3aea337f 100644
--- a/runtime-po/.gitignore
+++ b/runtime-po/.gitignore
@@ -1,12 +1,11 @@
+/*~
/*.gmo
/*.po
-/*.po~
/.reference
/LINGUAS
/Makefile
/Makefile.in
/Makefile.in.in
-/Makefile.in.in~
/Makevars
/Makevars.template
/POTFILES
@@ -15,7 +14,6 @@
/boldquot.sed
/en@boldquot.header
/en@quot.header
-/insert-header.sed
/insert-header.sin
/quot.sed
/remove-potcdate.sed