Commit 384358ad authored by Colin Watson's avatar Colin Watson
Browse files

Upgrade to Gnulib 20190105

In line with Gnulib, we now require Autoconf 2.63 and Automake 1.11.

* bootstrap: Sync to Gnulib d271f868a8df9bbec29049d01e056481b7a1a263.
* bootstrap.conf (GNULIB_REVISION): Set to
d271f868a8df9bbec29049d01e056481b7a1a263.
(buildreq): Bump required autoconf version to 2.63.
* configure.ac (AM_INIT_AUTOMAKE): Bump to 1.11.
(AM_SILENT_RULES, AM_PROG_AR): Remove conditionals, which were there for
Automake 1.10 support.
(AC_PREREQ): Bump to 2.63.
* NEWS: Document this.
parent 1c2faf2c
libpipeline 1.5.1
=================
Building libpipeline now requires Autoconf 2.63 and Automake 1.11.
libpipeline 1.5.0 (14 November 2017)
====================================
......
#! /bin/sh
# Print a version string.
scriptversion=2018-05-27.20; # 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
......@@ -142,6 +142,9 @@ die() { warn_ "$@"; exit 1; }
# Configuration.
# Name of the Makefile.am
gnulib_mk=gnulib.mk
# List of gnulib modules needed.
gnulib_modules=
......@@ -159,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
......@@ -738,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"
}
......@@ -942,13 +935,13 @@ fi
if $use_gnulib; then
gnulib_tool_options="\
--no-changelog\
--aux-dir $build_aux\
--doc-base $doc_base\
--lib $gnulib_name\
--m4-base $m4_base/\
--source-base $source_base/\
--tests-base $tests_base\
--local-dir $local_gl_dir\
--aux-dir=$build_aux\
--doc-base=$doc_base\
--lib=$gnulib_name\
--m4-base=$m4_base/\
--source-base=$source_base/\
--tests-base=$tests_base\
--local-dir=$local_gl_dir\
$gnulib_tool_option_extras\
"
if test $use_libtool = 1; then
......@@ -970,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
......
......@@ -16,7 +16,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
GNULIB_REVISION=90f289f249a266b1afb9c63e182f5d979d17df5f
GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
# gnulib modules used by this package.
gnulib_modules="
......@@ -70,7 +70,7 @@ SKIP_PO=t
# Build prerequisites
buildreq="\
autoconf 2.59
autoconf 2.63
automake 1.11
git 1.5.5
"
......@@ -24,10 +24,10 @@ m4_pattern_forbid([^PIPELINE_])
# Initialise and check we're in the correct directory.
AC_INIT([libpipeline], [1.5.0], [cjwatson@debian.org])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign])
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign])
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([lib/pipeline.c])
AC_GNU_SOURCE
PIPELINE_TAR_SORT_NAME
......@@ -52,7 +52,7 @@ then
gl_WARN_ADD([-Wno-missing-field-initializers])
fi
AC_PROG_LN_S
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AM_PROG_AR
LT_INIT([disable-static])
AC_DEFINE_UNQUOTED([SHELL], ["$SHELL"], [A POSIX shell interpreter.])
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [run_tests=yes], [run_tests=no])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment