diff options
author | Jim Meyering <meyering@fb.com> | 2016-01-01 15:04:08 -0800 |
---|---|---|
committer | Jim Meyering <meyering@fb.com> | 2016-01-01 17:50:24 -0800 |
commit | 2725db10000bae65e311a9329973b11053b86f1a (patch) | |
tree | cf2e82d3c9113c0b5c5d528b6b39c62d65ac816d /bootstrap | |
parent | 6bfbf81717c7bee5ae846e38ecf6af1ff1775d11 (diff) | |
download | gzip-2725db10000bae65e311a9329973b11053b86f1a.tar.gz |
maint: update copyright year, bootstrap, init.sh
Run "make update-copyright" and then...
* gzip.c: Transform the copyright notice via s/2015/2016/.
* gnulib: Update to latest.
* tests/init.sh: Update from gnulib.
* bootstrap: Likewise.
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2013-12-05.23; # UTC +scriptversion=2014-12-08.12; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 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 @@ -42,6 +42,9 @@ export LC_ALL local_gl_dir=gl +# Honour $PERL, but work even if there is none +PERL="${PERL-perl}" + me=$0 usage() { @@ -456,6 +459,7 @@ check_versions() { test "$appvar" = TAR && appvar=AMTAR case $appvar in GZIP) ;; # Do not use $GZIP: it contains gzip options. + PERL::*) ;; # Keep perl modules as-is *) eval "app=\${$appvar-$app}" ;; esac @@ -473,6 +477,17 @@ check_versions() { ret=1 continue } ;; + # Another check is for perl modules. These can be written as + # e.g. perl::XML::XPath in case of XML::XPath module, etc. + perl::*) + # Extract module name + app="${app#perl::}" + if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then + warn_ "Error: perl module '$app' not found" + ret=1 + fi + continue + ;; esac if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved @@ -900,7 +915,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 \ |