Run 'make update-gnulib-to-latest'. * bootstrap: Sync from gnulib/build-aux/bootstrap. * gnulib: Update to latest. * configure.ac (AC_PREREQ): Change from very old 2.59 to current 2.69 to avoid gnulib-tool complaining about "minimum supported autoconf version is 2.63". --- bootstrap | 22 ++++++---------------- configure.ac | 2 +- gnulib | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/bootstrap b/bootstrap index 6f74a028..5264d9f1 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2018-07-25.07; # UTC +scriptversion=2018-10-13.05; # UTC # Bootstrap this package from checked-out sources. @@ -162,18 +162,11 @@ bootstrap_post_import_hook() { :; } # 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. +# The command to download all .po files for a specified domain into a +# specified directory. Fill in the first %s with the destination +# directory and the second with the domain name. po_download_command_format=\ -"rsync --delete --exclude '*.s1' -Lrtvz \ - 'translationproject.org::tp/latest/%s/' '%s'" - -# Fallback for downloading .po files (if rsync fails). -po_download_command_format2=\ -"wget --mirror -nd -q -np -A.po -P '%s' \ +"wget --mirror --level=1 -nd -q -A.po -P '%s' \ https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else @@ -741,10 +734,7 @@ download_po_files() { subdir=$1 domain=$2 echo "$me: getting translations into $subdir for $domain..." - cmd=$(printf "$po_download_command_format" "$domain" "$subdir") - eval "$cmd" && return - # Fallback to HTTPS. - cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") + cmd=$(printf "$po_download_command_format" "$subdir" "$domain") eval "$cmd" } diff --git a/configure.ac b/configure.ac index 2acf54c7..9d3719be 100644 --- a/configure.ac +++ b/configure.ac @@ -271,7 +271,7 @@ dnl #11710) (Sun Sep 4 20:15:11 2005: gl_INCLUDED_REGEX no longer seems dnl to be available in gnulib CVS) gl_REGEX -AC_PREREQ(2.59) +AC_PREREQ([2.69]) jy_SORTZ diff --git a/gnulib b/gnulib index c1599f2f..28098428 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit c1599f2feb33dda51a23a3ac9e51a2e4bc98954d +Subproject commit 28098428d3d371a238837f338739283cf19dc650 -- 2.19.1