diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | bootstrap | 34 | ||||
| -rw-r--r-- | bootstrap.conf | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
4 files changed, 26 insertions, 23 deletions
@@ -3,6 +3,9 @@ man-db 2.8.5 Major changes since man-db 2.8.4: + Building man-db now requires Autoconf >= 2.63 and Automake >= + 1.11.2. + Fixes: ------ @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2018-07-25.07; # UTC +scriptversion=2019-01-04.17; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2019 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 @@ -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 --include '*.po' --exclude '*' -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" } @@ -973,6 +963,16 @@ fi bootstrap_post_import_hook \ || die "bootstrap_post_import_hook failed" +# Don't proceed if there are uninitialized submodules. In particular, +# the next step will remove dangling links, which might be links into +# uninitialized submodules. +# +# Uninitialized submodules are listed with an initial dash. +if $use_git && git submodule | grep '^-' >/dev/null; then + die "some git submodules are not initialized. " \ + "Run 'git submodule init' and bootstrap again." +fi + # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual diff --git a/bootstrap.conf b/bootstrap.conf index 810cd154..4e6c149f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -GNULIB_REVISION=900ca5c0b092e50f9f17329feea3fbfe2b6e2139 +GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263 # gnulib modules used by this package. gnulib_modules=" @@ -105,8 +105,8 @@ SKIP_PO=t # Build prerequisites buildreq="\ -autoconf 2.59 -automake 1.11 +autoconf 2.63 +automake 1.11.2 autopoint 0.18.3 gettext 0.18.3 git 1.5.5 diff --git a/configure.ac b/configure.ac index 4bdcbaed..7c79e7ac 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,8 @@ AC_INIT([man-db], [2.8.4], [cjwatson@debian.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.11 -Wall -Wno-override -Werror foreign dist-xz no-dist-gzip parallel-tests]) AM_MAINTAINER_MODE -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_PREREQ([2.59]) +AM_SILENT_RULES([yes]) +AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([src/man.c]) AC_GNU_SOURCE MAN_TAR_SORT_NAME @@ -73,7 +73,7 @@ then fi AC_PROG_INSTALL AC_PROG_LN_S -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +AM_PROG_AR LT_INIT([disable-static]) AC_CHECK_PROGS([cat], [cat]) MAN_CHECK_PROGS([browser], [BROWSER], [use BROWSER as default web browser], [www-browser lynx elinks w3m]) |