Commit ba8da2dc authored by Colin Watson's avatar Colin Watson
Browse files

Upgrade to Gnulib 20201125

In line with Gnulib, we now require Autoconf 2.64.

* bootstrap: Sync to Gnulib f2a67f071d170920314c9a3b8de3e85259b4e010.
* bootstrap.conf (GNULIB_REVISION): Set to
f2a67f071d170920314c9a3b8de3e85259b4e010.
(buildreq): Bump required autoconf version to 2.64.
* configure.ac (AC_PREREQ): Bump to 2.64.
* NEWS: Document this.
parent 94a7e125
Pipeline #221370520 passed with stages
in 3 minutes and 29 seconds
......@@ -3,6 +3,8 @@ libpipeline 1.5.4
Move Git repository to GitLab (https://gitlab.com/cjwatson/libpipeline).
Building libpipeline now requires Autoconf >= 2.64.
libpipeline 1.5.3 (13 August 2020)
==================================
......
#! /bin/sh
# Print a version string.
scriptversion=2019-01-04.17; # UTC
scriptversion=2020-11-18.17; # UTC
# Bootstrap this package from checked-out sources.
# Copyright (C) 2003-2019 Free Software Foundation, Inc.
# Copyright (C) 2003-2020 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
......@@ -71,7 +71,9 @@ Options:
--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
EOF
bootstrap_print_option_usage_hook
cat <<EOF
If the file $me.conf exists in the same directory as this script, its
contents are read as shell variables to configure the bootstrap.
......@@ -154,6 +156,18 @@ gnulib_files=
: ${AUTOPOINT=autopoint}
: ${AUTORECONF=autoreconf}
# A function to be called for each unrecognized option. Returns 0 if
# the option in $1 has been processed by the function. Returns 1 if
# the option has not been processed by the function. Override it via
# your own definition in bootstrap.conf
bootstrap_option_hook() { return 1; }
# A function to be called in order to print the --help information
# corresponding to user-defined command-line options.
bootstrap_print_option_usage_hook() { :; }
# A function to be called right after gnulib-tool is run.
# Override it via your own definition in bootstrap.conf.
bootstrap_post_import_hook() { :; }
......@@ -166,7 +180,7 @@ bootstrap_epilogue() { :; }
# specified directory. Fill in the first %s with the destination
# directory and the second with the domain name.
po_download_command_format=\
"wget --mirror --level=1 -nd -q -A.po -P '%s' \
"wget --mirror --level=1 -nd -nv -A.po -P '%s' \
https://translationproject.org/latest/%s/"
# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
......@@ -335,7 +349,7 @@ do
--no-git)
use_git=false;;
*)
die "$option: unknown option";;
bootstrap_option_hook $option || die "$option: unknown option";;
esac
done
......@@ -970,7 +984,7 @@ bootstrap_post_import_hook \
# 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."
"Run 'git submodule update --init' and bootstrap again."
fi
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
......
......@@ -16,7 +16,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
GNULIB_REVISION=34881aff4043847f2640d90cf9aa325cc3ad08d6
GNULIB_REVISION=f2a67f071d170920314c9a3b8de3e85259b4e010
# gnulib modules used by this package.
gnulib_modules="
......@@ -71,7 +71,7 @@ SKIP_PO=t
# Build prerequisites
buildreq="\
autoconf 2.63
autoconf 2.64
automake 1.11.2
git 1.5.5
"
......@@ -27,7 +27,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign])
AM_MAINTAINER_MODE
AM_SILENT_RULES([yes])
AC_PREREQ([2.63])
AC_PREREQ([2.64])
AC_CONFIG_SRCDIR([lib/pipeline.c])
AC_GNU_SOURCE
PIPELINE_TAR_SORT_NAME
......
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