summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-09-30 12:58:11 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-09-30 12:58:11 +0900
commit19d04ea285be5c7b1640fbdde69267353f65b8e5 (patch)
tree9d9ab6e8f31fef1941f19114781d2741394a87e2
parentc91f8698b6a0ca60d1a571decc855902270522d9 (diff)
downloadautomake-19d04ea285be5c7b1640fbdde69267353f65b8e5.tar.gz
automake-19d04ea285be5c7b1640fbdde69267353f65b8e5.tar.bz2
automake-19d04ea285be5c7b1640fbdde69267353f65b8e5.zip
Imported Upstream version 1.16.4upstream/1.16.4
-rw-r--r--ChangeLog464
-rw-r--r--GNUmakefile2
-rw-r--r--HACKING208
-rw-r--r--INSTALL6
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.in30
-rw-r--r--NEWS102
-rw-r--r--NEWS-2.097
-rw-r--r--README10
-rw-r--r--THANKS15
-rw-r--r--aclocal.m4847
-rw-r--r--bin/aclocal.in2
-rw-r--r--bin/automake.in107
-rw-r--r--bin/local.mk2
-rwxr-xr-xbootstrap4
-rwxr-xr-xconfigure1786
-rw-r--r--configure.ac15
-rw-r--r--contrib/check-html.am2
-rw-r--r--contrib/multilib/config-ml.in2
-rw-r--r--contrib/multilib/multi.m42
-rw-r--r--contrib/multilib/multilib.am2
-rwxr-xr-xcontrib/multilib/symlink-tree2
-rwxr-xr-xcontrib/t/help-multilib.sh2
-rw-r--r--contrib/t/local.mk2
-rwxr-xr-xcontrib/t/multilib.sh15
-rwxr-xr-xcontrib/t/parallel-tests-html-recursive.sh2
-rwxr-xr-xcontrib/t/parallel-tests-html.sh2
-rwxr-xr-xcontrib/tap-driver.pl2
-rw-r--r--doc/amhello-1.0.tar.gzbin86268 -> 86818 bytes
-rw-r--r--doc/amhello/Makefile.am2
-rw-r--r--doc/amhello/configure.ac2
-rw-r--r--doc/amhello/src/Makefile.am2
-rw-r--r--doc/amhello/src/main.c2
-rw-r--r--doc/automake-history.info8
-rw-r--r--doc/automake-history.texi2
-rw-r--r--doc/automake.info419
-rw-r--r--doc/automake.info-1360
-rw-r--r--doc/automake.info-2797
-rw-r--r--doc/automake.texi898
-rw-r--r--doc/fdl.texi2
-rwxr-xr-xdoc/help2man2
-rw-r--r--doc/local.mk2
-rw-r--r--doc/stamp-vti8
-rw-r--r--doc/version.texi8
-rwxr-xr-xgen-testsuite-part2
-rw-r--r--lib/Automake/ChannelDefs.pm2
-rw-r--r--lib/Automake/Channels.pm2
-rw-r--r--lib/Automake/Condition.pm2
-rw-r--r--lib/Automake/Config.in2
-rw-r--r--lib/Automake/Configure_ac.pm2
-rw-r--r--lib/Automake/DisjConditions.pm2
-rw-r--r--lib/Automake/FileUtils.pm2
-rw-r--r--lib/Automake/General.pm2
-rw-r--r--lib/Automake/Getopt.pm2
-rw-r--r--lib/Automake/Item.pm2
-rw-r--r--lib/Automake/ItemDef.pm2
-rw-r--r--lib/Automake/Language.pm2
-rw-r--r--lib/Automake/Location.pm2
-rw-r--r--lib/Automake/Options.pm3
-rw-r--r--lib/Automake/Rule.pm2
-rw-r--r--lib/Automake/RuleDef.pm2
-rw-r--r--lib/Automake/VarDef.pm2
-rw-r--r--lib/Automake/Variable.pm2
-rw-r--r--lib/Automake/Version.pm2
-rw-r--r--lib/Automake/Wrap.pm2
-rw-r--r--lib/Automake/XFile.pm2
-rw-r--r--lib/Automake/local.mk2
-rw-r--r--lib/INSTALL6
-rw-r--r--lib/am/check.am2
-rw-r--r--lib/am/check2.am2
-rw-r--r--lib/am/clean-hdr.am2
-rw-r--r--lib/am/clean.am2
-rw-r--r--lib/am/compile.am2
-rw-r--r--lib/am/configure.am2
-rw-r--r--lib/am/data.am2
-rw-r--r--lib/am/dejagnu.am2
-rw-r--r--lib/am/depend.am2
-rw-r--r--lib/am/depend2.am2
-rw-r--r--lib/am/distdir.am7
-rw-r--r--lib/am/footer.am2
-rw-r--r--lib/am/header-vars.am2
-rw-r--r--lib/am/header.am2
-rw-r--r--lib/am/inst-vars.am2
-rw-r--r--lib/am/install.am2
-rw-r--r--lib/am/java.am2
-rw-r--r--lib/am/lang-compile.am2
-rw-r--r--lib/am/lex.am2
-rw-r--r--lib/am/library.am2
-rw-r--r--lib/am/libs.am2
-rw-r--r--lib/am/libtool.am2
-rw-r--r--lib/am/lisp.am2
-rw-r--r--lib/am/local.mk2
-rw-r--r--lib/am/ltlib.am2
-rw-r--r--lib/am/ltlibrary.am2
-rw-r--r--lib/am/mans-vars.am2
-rw-r--r--lib/am/mans.am2
-rw-r--r--lib/am/program.am2
-rw-r--r--lib/am/progs.am2
-rw-r--r--lib/am/python.am2
-rw-r--r--lib/am/remake-hdr.am2
-rw-r--r--lib/am/scripts.am2
-rw-r--r--lib/am/subdirs.am2
-rw-r--r--lib/am/tags.am5
-rw-r--r--lib/am/texi-vers.am2
-rw-r--r--lib/am/texibuild.am2
-rw-r--r--lib/am/texinfos.am2
-rw-r--r--lib/am/vala.am2
-rw-r--r--lib/am/yacc.am2
-rwxr-xr-xlib/ar-lib2
-rwxr-xr-xlib/compile2
-rwxr-xr-xlib/config.guess1262
-rwxr-xr-xlib/config.sub80
-rwxr-xr-xlib/depcomp2
-rwxr-xr-xlib/gendocs.sh10
-rw-r--r--lib/gendocs_template2
-rwxr-xr-xlib/gitlog-to-changelog7
-rwxr-xr-xlib/gnupload13
-rw-r--r--lib/local.mk2
-rwxr-xr-xlib/mdate-sh2
-rwxr-xr-xlib/missing2
-rwxr-xr-xlib/py-compile4
-rwxr-xr-xlib/tap-driver.sh2
-rwxr-xr-xlib/test-driver11
-rw-r--r--lib/texinfo.tex418
-rwxr-xr-xlib/update-copyright2
-rwxr-xr-xlib/ylwrap2
-rw-r--r--m4/amversion.in2
-rw-r--r--m4/amversion.m46
-rw-r--r--m4/ar-lib.m42
-rw-r--r--m4/as.m42
-rw-r--r--m4/auxdir.m42
-rw-r--r--m4/cond-if.m42
-rw-r--r--m4/cond.m42
-rw-r--r--m4/depend.m42
-rw-r--r--m4/depout.m42
-rw-r--r--m4/dmalloc.m42
-rw-r--r--m4/extra-recurs.m42
-rw-r--r--m4/gcj.m42
-rw-r--r--m4/init.m418
-rw-r--r--m4/install-sh.m42
-rw-r--r--m4/internal/ac-config-macro-dirs.m42
-rw-r--r--m4/lead-dot.m42
-rw-r--r--m4/lex.m42
-rw-r--r--m4/lispdir.m42
-rw-r--r--m4/local.mk2
-rw-r--r--m4/maintainer.m42
-rw-r--r--m4/make.m42
-rw-r--r--m4/missing.m42
-rw-r--r--m4/mkdirp.m42
-rw-r--r--m4/obsolete.m42
-rw-r--r--m4/options.m42
-rw-r--r--m4/prog-cc-c-o.m42
-rw-r--r--m4/python.m4101
-rw-r--r--m4/runlog.m42
-rw-r--r--m4/sanity.m42
-rw-r--r--m4/silent.m42
-rw-r--r--m4/strip.m42
-rw-r--r--m4/substnot.m42
-rw-r--r--m4/tar.m42
-rw-r--r--m4/upc.m42
-rw-r--r--m4/vala.m42
-rwxr-xr-xmaintainer/am-ft2
-rwxr-xr-xmaintainer/am-xft2
-rw-r--r--maintainer/maint.mk2
-rwxr-xr-xmaintainer/rename-tests2
-rw-r--r--maintainer/syntax-checks.mk4
-rw-r--r--old/ChangeLog-tests2
-rw-r--r--old/ChangeLog.002
-rw-r--r--old/ChangeLog.012
-rw-r--r--old/ChangeLog.022
-rw-r--r--old/ChangeLog.032
-rw-r--r--old/ChangeLog.042
-rw-r--r--old/ChangeLog.092
-rw-r--r--old/ChangeLog.112
-rw-r--r--old/ChangeLog.962
-rw-r--r--old/ChangeLog.982
-rw-r--r--old/TODO2
-rw-r--r--pre-inst-env.in2
-rw-r--r--t/CheckListOfTests.am2
-rw-r--r--t/ac-output-old.tap2
-rw-r--r--t/aclocal-I-and-install.sh2
-rw-r--r--t/aclocal-I-order-1.sh2
-rw-r--r--t/aclocal-I-order-2.sh2
-rw-r--r--t/aclocal-I-order-3.sh2
-rw-r--r--t/aclocal-acdir.sh2
-rw-r--r--t/aclocal-amflags.sh2
-rw-r--r--t/aclocal-autoconf-version-check.sh2
-rw-r--r--t/aclocal-comments-respected.sh2
-rw-r--r--t/aclocal-deleted-header-aclocal-amflags.sh2
-rw-r--r--t/aclocal-deleted-header.sh2
-rw-r--r--t/aclocal-deps-subdir.sh2
-rw-r--r--t/aclocal-deps.sh2
-rw-r--r--t/aclocal-dirlist-abspath.sh2
-rw-r--r--t/aclocal-dirlist-globbing.sh2
-rw-r--r--t/aclocal-dirlist.sh2
-rw-r--r--t/aclocal-install-absdir.sh2
-rw-r--r--t/aclocal-install-fail.sh2
-rw-r--r--t/aclocal-install-mkdir.sh2
-rw-r--r--t/aclocal-m4-include-are-scanned-aclocal-amflags.sh2
-rw-r--r--t/aclocal-m4-include-are-scanned.sh2
-rw-r--r--t/aclocal-m4-sinclude.sh2
-rw-r--r--t/aclocal-macrodir.tap2
-rw-r--r--t/aclocal-macrodirs.tap2
-rw-r--r--t/aclocal-missing-macros.sh2
-rw-r--r--t/aclocal-no-extra-scan.sh2
-rw-r--r--t/aclocal-no-force.sh2
-rw-r--r--t/aclocal-no-install-no-mkdir.sh2
-rw-r--r--t/aclocal-no-symlinked-overwrite.sh2
-rw-r--r--t/aclocal-no-unused-required.sh2
-rw-r--r--t/aclocal-path-install-serial.sh2
-rw-r--r--t/aclocal-path-install.sh2
-rw-r--r--t/aclocal-path-nonexistent.sh2
-rw-r--r--t/aclocal-path-precedence.sh2
-rw-r--r--t/aclocal-path.sh2
-rw-r--r--t/aclocal-pr450.sh2
-rw-r--r--t/aclocal-print-acdir.sh2
-rw-r--r--t/aclocal-remake-misc.sh2
-rw-r--r--t/aclocal-req.sh2
-rw-r--r--t/aclocal-scan-configure-ac-pr319.sh2
-rw-r--r--t/aclocal-serial.sh2
-rw-r--r--t/aclocal-underquoted-defun.sh2
-rw-r--r--t/aclocal-verbose-install.sh2
-rw-r--r--t/aclocal.sh2
-rw-r--r--t/acsilent.sh2
-rw-r--r--t/acsubst.sh2
-rw-r--r--t/acsubst2.sh2
-rw-r--r--t/add-missing-install-sh.sh2
-rw-r--r--t/add-missing-multiple.sh2
-rw-r--r--t/add-missing.tap2
-rw-r--r--t/all.sh2
-rw-r--r--t/all2.sh2
-rw-r--r--t/alloca.sh2
-rw-r--r--t/alloca2.sh2
-rw-r--r--t/alpha.sh2
-rw-r--r--t/alpha2.sh2
-rw-r--r--t/am-config-header.sh2
-rw-r--r--t/am-default-source-ext.sh2
-rw-r--r--t/am-include-only-one-generated-fragment.sh2
-rw-r--r--t/am-macro-not-found.sh2
-rw-r--r--t/am-missing-prog.sh2
-rw-r--r--t/am-prog-cc-c-o.sh2
-rw-r--r--t/am-prog-cc-stdc.sh2
-rw-r--r--t/am-tests-environment.sh2
-rw-r--r--t/amassign.sh2
-rw-r--r--t/amhello-binpkg.sh2
-rw-r--r--t/amhello-cflags.sh2
-rw-r--r--t/amhello-cross-compile.sh2
-rw-r--r--t/aminit-moreargs-deprecation.sh2
-rw-r--r--t/aminit-trailing-dnl-comment-pr16841.sh2
-rw-r--r--t/amopt.sh2
-rw-r--r--t/amopts-location.sh2
-rw-r--r--t/amopts-variable-expansion.sh2
-rw-r--r--t/amsubst.sh2
-rw-r--r--t/ansi2knr-no-more.sh2
-rw-r--r--t/ar-lib.sh2
-rw-r--r--t/ar-lib2.sh2
-rw-r--r--t/ar-lib3.sh2
-rw-r--r--t/ar-lib4.sh2
-rw-r--r--t/ar-lib5a.sh2
-rw-r--r--t/ar-lib5b.sh2
-rw-r--r--t/ar-lib6a.sh2
-rw-r--r--t/ar-lib6b.sh2
-rw-r--r--t/ar-lib7.sh2
-rw-r--r--t/ar.sh2
-rw-r--r--t/ar2.sh2
-rw-r--r--t/ar3.sh2
-rw-r--r--t/ar4.sh2
-rw-r--r--t/ar5.sh2
-rw-r--r--t/asm.sh2
-rw-r--r--t/asm2.sh2
-rw-r--r--t/asm3.sh2
-rw-r--r--t/autodist-acconfig-no-subdir.sh2
-rw-r--r--t/autodist-acconfig.sh2
-rw-r--r--t/autodist-aclocal-m4.sh2
-rw-r--r--t/autodist-config-headers.sh2
-rw-r--r--t/autodist-configure-no-subdir.sh2
-rw-r--r--t/autodist-no-duplicate.sh2
-rw-r--r--t/autodist-stamp-vti.sh6
-rw-r--r--t/autodist-subdir.sh2
-rw-r--r--t/autodist.sh2
-rw-r--r--t/autohdr-subdir-pr12495.sh2
-rw-r--r--t/autohdr.sh2
-rw-r--r--t/autohdr3.sh2
-rw-r--r--t/autohdr4.sh2
-rw-r--r--t/autohdrdry.sh2
-rw-r--r--t/automake-cmdline.tap2
-rw-r--r--t/auxdir-autodetect.sh2
-rw-r--r--t/auxdir-cc-pr15981.sh2
-rw-r--r--t/auxdir-computed.tap2
-rw-r--r--t/auxdir-misplaced.sh2
-rw-r--r--t/auxdir-nonexistent.sh2
-rw-r--r--t/auxdir-pr15981.sh2
-rw-r--r--t/auxdir-pr19311.sh2
-rw-r--r--t/auxdir-unportable.tap2
-rw-r--r--t/auxdir.sh2
-rw-r--r--t/auxdir6.sh2
-rw-r--r--t/auxdir7.sh2
-rw-r--r--t/auxdir8.sh2
-rw-r--r--t/ax/am-test-lib.sh2
-rw-r--r--t/ax/cc-no-c-o.in2
-rw-r--r--t/ax/deltree.pl2
-rw-r--r--t/ax/depcomp.sh2
-rw-r--r--t/ax/distcheck-hook-m4.am2
-rw-r--r--t/ax/extract-testsuite-summary.pl2
-rwxr-xr-xt/ax/is2
-rwxr-xr-xt/ax/is_newest2
-rw-r--r--t/ax/runtest.in2
-rw-r--r--t/ax/shell-no-trail-bslash.in2
-rw-r--r--t/ax/tap-functions.sh2
-rw-r--r--t/ax/tap-setup.sh2
-rw-r--r--t/ax/tap-summary-aux.sh2
-rw-r--r--t/ax/test-defs.in2
-rw-r--r--t/ax/test-init.sh2
-rw-r--r--t/ax/test-lib.sh2
-rw-r--r--t/ax/testsuite-summary-checks.sh2
-rw-r--r--t/ax/trivial-test-driver2
-rw-r--r--t/backcompat-acout.sh2
-rw-r--r--t/backcompat.sh2
-rw-r--r--t/backcompat2.sh2
-rw-r--r--t/backcompat3.sh2
-rw-r--r--t/backcompat6.sh2
-rw-r--r--t/backslash-before-trailing-whitespace.sh2
-rw-r--r--t/backslash-issues.sh2
-rw-r--r--t/badline.sh2
-rw-r--r--t/badopt.sh2
-rw-r--r--t/badprog.sh2
-rw-r--r--t/built-sources-check.sh2
-rw-r--r--t/built-sources-cond.sh2
-rw-r--r--t/built-sources-fork-bomb.sh2
-rwxr-xr-xt/built-sources-install-exec.sh2
-rw-r--r--t/built-sources-install.sh2
-rw-r--r--t/built-sources-subdir.sh2
-rw-r--r--t/built-sources.sh2
-rw-r--r--t/c-demo.sh2
-rw-r--r--t/candist.sh2
-rw-r--r--t/canon-name.sh2
-rw-r--r--t/canon.sh2
-rw-r--r--t/canon2.sh2
-rw-r--r--t/canon3.sh2
-rw-r--r--t/canon4.sh2
-rw-r--r--t/canon5.sh2
-rw-r--r--t/canon6.sh2
-rw-r--r--t/canon7.sh2
-rw-r--r--t/canon8.sh2
-rwxr-xr-xt/ccnoco-deps.sh2
-rwxr-xr-xt/ccnoco-lib.sh2
-rwxr-xr-xt/ccnoco-lt.sh2
-rw-r--r--t/ccnoco.sh2
-rw-r--r--t/ccnoco3.sh2
-rw-r--r--t/ccnoco4.sh2
-rw-r--r--t/check-concurrency-bug9245.sh2
-rw-r--r--t/check-exported-srcdir.sh2
-rw-r--r--t/check-fd-redirect.sh2
-rw-r--r--t/check-no-test-driver.sh2
-rw-r--r--t/check-subst-prog.sh2
-rw-r--r--t/check-subst.sh2
-rw-r--r--t/check-tests-in-builddir.sh2
-rw-r--r--t/check.sh2
-rw-r--r--t/check10.sh2
-rw-r--r--t/check11.sh2
-rw-r--r--t/check12.sh64
-rw-r--r--t/check2.sh2
-rw-r--r--t/check4.sh2
-rw-r--r--t/check5.sh2
-rw-r--r--t/check6.sh2
-rw-r--r--t/check7.sh2
-rw-r--r--t/check8.sh2
-rw-r--r--t/checkall.sh2
-rw-r--r--t/clean.sh2
-rw-r--r--t/colneq.sh2
-rw-r--r--t/colneq2.sh2
-rw-r--r--t/colneq3.sh2
-rw-r--r--t/colon.sh2
-rw-r--r--t/colon2.sh2
-rw-r--r--t/colon3.sh2
-rw-r--r--t/colon4.sh2
-rw-r--r--t/colon5.sh2
-rw-r--r--t/colon6.sh2
-rw-r--r--t/colon7.sh2
-rw-r--r--t/color-tests-opt.sh2
-rw-r--r--t/color-tests.sh2
-rw-r--r--t/color-tests2.sh2
-rw-r--r--t/commen10.sh2
-rw-r--r--t/commen11.sh2
-rw-r--r--t/comment-block.sh2
-rw-r--r--t/comment.sh2
-rw-r--r--t/comment2.sh2
-rw-r--r--t/comment3.sh2
-rw-r--r--t/comment4.sh2
-rw-r--r--t/comment5.sh2
-rw-r--r--t/comment6.sh2
-rw-r--r--t/comment7.sh2
-rw-r--r--t/comment8.sh2
-rw-r--r--t/comment9.sh2
-rw-r--r--t/comments-in-var-def.sh2
-rw-r--r--t/compile.sh2
-rw-r--r--t/compile2.sh2
-rw-r--r--t/compile3.sh2
-rw-r--r--t/compile4.sh2
-rw-r--r--t/compile5.sh2
-rw-r--r--t/compile6.sh2
-rw-r--r--t/compile7.sh2
-rw-r--r--t/compile_f90_c_cxx.sh2
-rw-r--r--t/compile_f_c_cxx.sh2
-rw-r--r--t/cond-basic.sh2
-rw-r--r--t/cond.sh2
-rw-r--r--t/cond10.sh2
-rw-r--r--t/cond11.sh2
-rw-r--r--t/cond13.sh2
-rw-r--r--t/cond14.sh2
-rw-r--r--t/cond15.sh2
-rw-r--r--t/cond16.sh2
-rw-r--r--t/cond17.sh2
-rw-r--r--t/cond18.sh2
-rw-r--r--t/cond19.sh2
-rw-r--r--t/cond20.sh2
-rw-r--r--t/cond21.sh2
-rw-r--r--t/cond22.sh2
-rw-r--r--t/cond23.sh2
-rw-r--r--t/cond24.sh2
-rw-r--r--t/cond25.sh2
-rw-r--r--t/cond26.sh2
-rw-r--r--t/cond27.sh2
-rw-r--r--t/cond28.sh2
-rw-r--r--t/cond3.sh2
-rw-r--r--t/cond30.sh2
-rw-r--r--t/cond31.sh2
-rw-r--r--t/cond32.sh2
-rw-r--r--t/cond33.sh2
-rw-r--r--t/cond34.sh2
-rw-r--r--t/cond35.sh2
-rw-r--r--t/cond36.sh2
-rw-r--r--t/cond37.sh2
-rw-r--r--t/cond38.sh2
-rw-r--r--t/cond39.sh2
-rw-r--r--t/cond4.sh2
-rw-r--r--t/cond40.sh2
-rw-r--r--t/cond41.sh2
-rw-r--r--t/cond42.sh2
-rw-r--r--t/cond43.sh2
-rw-r--r--t/cond44.sh2
-rw-r--r--t/cond45.sh2
-rw-r--r--t/cond46.sh2
-rw-r--r--t/cond5.sh2
-rw-r--r--t/cond6.sh2
-rw-r--r--t/cond7.sh2
-rw-r--r--t/cond8.sh2
-rw-r--r--t/cond9.sh2
-rw-r--r--t/condd.sh2
-rw-r--r--t/condhook.sh2
-rw-r--r--t/condhook2.sh2
-rw-r--r--t/condinc.sh2
-rw-r--r--t/condinc2.sh2
-rw-r--r--t/condlib.sh2
-rw-r--r--t/condman2.sh2
-rw-r--r--t/condman3.sh2
-rw-r--r--t/confdeps.sh2
-rw-r--r--t/conff.sh2
-rw-r--r--t/conff2.sh2
-rw-r--r--t/conffile-leading-dot.sh2
-rw-r--r--t/confh-subdir-clean.sh2
-rw-r--r--t/confh.sh2
-rw-r--r--t/confh4.sh2
-rw-r--r--t/confh5.sh2
-rw-r--r--t/confh6.sh2
-rw-r--r--t/confh7.sh2
-rw-r--r--t/confh8.sh2
-rw-r--r--t/configure.sh2
-rw-r--r--t/confincl.sh2
-rw-r--r--t/conflnk.sh2
-rw-r--r--t/conflnk2.sh2
-rw-r--r--t/conflnk3.sh2
-rw-r--r--t/conflnk4.sh2
-rw-r--r--t/confsub.sh2
-rw-r--r--t/confvar.sh2
-rw-r--r--t/confvar2.sh2
-rw-r--r--t/copy.sh2
-rw-r--r--t/cscope.tap2
-rw-r--r--t/cscope2.sh2
-rw-r--r--t/cscope3.sh2
-rw-r--r--t/cxx-demo.sh2
-rw-r--r--t/cxx-lt-demo.sh2
-rw-r--r--t/cxx.sh2
-rw-r--r--t/cxx2.sh2
-rw-r--r--t/cxxcpp.sh2
-rw-r--r--t/cxxlibobj.sh2
-rw-r--r--t/cxxlink.sh2
-rw-r--r--t/cxxnoc.sh2
-rw-r--r--t/cygnus-no-more.sh2
-rw-r--r--t/cygwin32.sh2
-rw-r--r--t/dash.sh2
-rw-r--r--t/defun.sh2
-rw-r--r--t/defun2.sh2
-rw-r--r--t/dejagnu-absolute-builddir.sh21
-rw-r--r--t/dejagnu-relative-srcdir.sh34
-rw-r--r--t/dejagnu-siteexp-append.sh2
-rw-r--r--t/dejagnu-siteexp-extend.sh103
-rw-r--r--t/dejagnu-siteexp-useredit.sh33
-rw-r--r--t/dejagnu.sh2
-rw-r--r--t/dejagnu2.sh2
-rw-r--r--t/dejagnu3.sh22
-rw-r--r--t/dejagnu4.sh41
-rw-r--r--t/dejagnu5.sh22
-rw-r--r--t/dejagnu6.sh21
-rw-r--r--t/dejagnu7.sh21
-rw-r--r--t/deleted-am.sh2
-rw-r--r--t/deleted-m4.sh2
-rw-r--r--t/depacl2.sh2
-rw-r--r--t/depcomp-implicit-auxdir.sh2
-rw-r--r--t/depcomp.sh2
-rw-r--r--t/depcomp2.sh2
-rw-r--r--t/depcomp8a.sh2
-rw-r--r--t/depcomp8b.sh2
-rw-r--r--t/depdist.sh2
-rw-r--r--t/depend-postproc.sh2
-rw-r--r--t/depend.sh2
-rw-r--r--t/depend3.sh2
-rw-r--r--t/depend4.sh2
-rw-r--r--t/depend5.sh2
-rw-r--r--t/depend6.sh2
-rw-r--r--t/deprecated-acinit.sh3
-rw-r--r--t/destdir.sh2
-rw-r--r--t/dir-named-obj-is-bad.sh2
-rw-r--r--t/discover.sh2
-rw-r--r--t/dist-auxdir-many-subdirs.sh2
-rw-r--r--t/dist-auxfile-2.sh2
-rw-r--r--t/dist-auxfile.sh2
-rw-r--r--t/dist-formats.tap2
-rw-r--r--t/dist-included-parent-dir.sh2
-rw-r--r--t/dist-install-sh.sh2
-rw-r--r--t/dist-lzma.sh2
-rw-r--r--t/dist-missing-am.sh2
-rw-r--r--t/dist-missing-included-m4.sh2
-rw-r--r--t/dist-missing-m4.sh2
-rw-r--r--t/dist-no-built-sources.sh72
-rw-r--r--t/dist-pr109765.sh2
-rw-r--r--t/dist-readonly.sh2
-rw-r--r--t/dist-repeated.sh2
-rw-r--r--t/dist-shar.sh2
-rw-r--r--t/dist-tarZ.sh2
-rw-r--r--t/dist-vs-built-sources.sh2
-rw-r--r--t/dist-with-unreadable-makefile-fails.sh2
-rw-r--r--t/distcheck-configure-flags-am.sh2
-rw-r--r--t/distcheck-configure-flags-subpkg.sh2
-rw-r--r--t/distcheck-configure-flags.sh2
-rw-r--r--t/distcheck-hook.sh2
-rw-r--r--t/distcheck-hook2.sh2
-rw-r--r--t/distcheck-missing-m4.sh2
-rw-r--r--t/distcheck-no-prefix-or-srcdir-override.sh2
-rw-r--r--t/distcheck-outdated-m4.sh2
-rw-r--r--t/distcheck-override-dvi.sh2
-rw-r--r--t/distcheck-override-infodir.sh2
-rw-r--r--t/distcheck-pr10470.sh2
-rw-r--r--t/distcheck-pr18286.sh2
-rw-r--r--t/distcheck-pr9579.sh2
-rw-r--r--t/distcheck-writable-srcdir.sh2
-rw-r--r--t/distcleancheck.sh2
-rw-r--r--t/distcom-subdir.sh2
-rw-r--r--t/distcom2.sh2
-rw-r--r--t/distcom3.sh2
-rw-r--r--t/distcom4.sh2
-rw-r--r--t/distcom5.sh2
-rw-r--r--t/distdir.sh2
-rw-r--r--t/disthook.sh2
-rw-r--r--t/distlinks.sh2
-rw-r--r--t/distlinksbrk.sh2
-rw-r--r--t/distname.sh2
-rw-r--r--t/dmalloc.sh2
-rw-r--r--t/doc-parsing-buglets-colneq-subst.sh2
-rw-r--r--t/doc-parsing-buglets-tabs.sh2
-rw-r--r--t/dollar.sh2
-rw-r--r--t/dollarvar.sh2
-rw-r--r--t/dollarvar2.sh2
-rw-r--r--t/double.sh2
-rw-r--r--t/dup2.sh2
-rw-r--r--t/else.sh2
-rw-r--r--t/empty-data-primary.sh2
-rw-r--r--t/empty-sources-primary.tap2
-rw-r--r--t/exdir.sh2
-rw-r--r--t/exdir2.sh2
-rw-r--r--t/exdir3.sh2
-rw-r--r--t/exeext.sh2
-rw-r--r--t/exeext2.sh2
-rw-r--r--t/exeext3.sh2
-rw-r--r--t/exeext4.sh2
-rw-r--r--t/ext.sh2
-rw-r--r--t/ext2.sh2
-rw-r--r--t/ext3.sh2
-rw-r--r--t/extra-data.sh2
-rw-r--r--t/extra-deps-lt.sh2
-rw-r--r--t/extra-deps.sh2
-rw-r--r--t/extra-dist-dirs-and-subdirs.sh2
-rw-r--r--t/extra-dist-vpath-dir-merge.sh2
-rw-r--r--t/extra-dist-vpath-dir.sh2
-rw-r--r--t/extra-dist-wildcards-gnu.sh2
-rw-r--r--t/extra-dist-wildcards-vpath.sh2
-rw-r--r--t/extra-dist-wildcards.sh2
-rw-r--r--t/extra-portability.sh2
-rw-r--r--t/extra-portability2.sh2
-rw-r--r--t/extra-portability3.sh2
-rw-r--r--t/extra-programs-and-libs.sh2
-rw-r--r--t/extra-programs-empty.sh2
-rw-r--r--t/extra-programs-misc.sh2
-rw-r--r--t/extra-sources-no-spurious.sh2
-rw-r--r--t/extra-sources.sh2
-rw-r--r--t/extra.sh2
-rw-r--r--t/f90only.sh2
-rw-r--r--t/flavor.sh2
-rw-r--r--t/flibs.sh2
-rw-r--r--t/fn99.sh2
-rw-r--r--t/fn99subdir.sh2
-rw-r--r--t/fnoc.sh2
-rw-r--r--t/fonly.sh2
-rw-r--r--t/forcemiss.sh2
-rw-r--r--t/forcemiss2.sh2
-rw-r--r--t/fort1.sh2
-rw-r--r--t/fort2.sh2
-rw-r--r--t/fort4.sh2
-rw-r--r--t/fort5.sh2
-rw-r--r--t/fortdep.sh2
-rw-r--r--t/gcj.sh2
-rw-r--r--t/gcj2.sh2
-rw-r--r--t/gcj3.sh2
-rw-r--r--t/gcj4.sh2
-rw-r--r--t/gcj5.sh2
-rw-r--r--t/gcj6.sh2
-rw-r--r--t/get-sysconf.sh2
-rw-r--r--t/gettext-basics.sh2
-rw-r--r--t/gettext-config-rpath.sh2
-rw-r--r--t/gettext-external-pr338.sh2
-rw-r--r--t/gettext-intl-subdir.sh2
-rw-r--r--t/gettext-macros.sh2
-rw-r--r--t/gettext-pr381.sh2
-rw-r--r--t/gnits.sh2
-rw-r--r--t/gnits2.sh2
-rw-r--r--t/gnits3.sh2
-rw-r--r--t/gnumake.sh2
-rw-r--r--t/gnuwarn.sh2
-rw-r--r--t/gnuwarn2.sh2
-rw-r--r--t/hdr-vars-defined-once.sh2
-rw-r--r--t/header.sh2
-rw-r--r--t/help-depend.sh2
-rw-r--r--t/help-depend2.sh2
-rw-r--r--t/help-dmalloc.sh2
-rw-r--r--t/help-init.sh2
-rw-r--r--t/help-lispdir.sh2
-rw-r--r--t/help-python.sh2
-rw-r--r--t/help-silent.sh2
-rw-r--r--t/help-upc.sh2
-rw-r--r--t/help.sh2
-rw-r--r--t/help2.sh2
-rw-r--r--t/help3.sh2
-rw-r--r--t/help4.sh2
-rw-r--r--t/hfs.sh2
-rw-r--r--t/implicit.sh2
-rw-r--r--t/init.sh3
-rw-r--r--t/init2.sh2
-rw-r--r--t/install-info-dir.sh2
-rw-r--r--t/install-sh-option-C.sh2
-rw-r--r--t/install-sh-option-S.sh2
-rw-r--r--t/install-sh-unittests.sh2
-rw-r--r--t/installdir.sh2
-rw-r--r--t/instdat.sh2
-rw-r--r--t/instdat2.sh2
-rw-r--r--t/instdir-cond.sh2
-rw-r--r--t/instdir-cond2.sh2
-rw-r--r--t/instdir-java.sh2
-rw-r--r--t/instdir-lisp.sh2
-rw-r--r--t/instdir-ltlib.sh2
-rw-r--r--t/instdir-no-empty.sh2
-rw-r--r--t/instdir-prog.sh2
-rw-r--r--t/instdir-python.sh2
-rw-r--r--t/instdir-texi.sh2
-rw-r--r--t/instdir.sh2
-rw-r--r--t/instdir2.sh2
-rw-r--r--t/instexec.sh2
-rw-r--r--t/instfail-info.sh2
-rw-r--r--t/instfail-java.sh2
-rw-r--r--t/instfail-libtool.sh2
-rw-r--r--t/instfail.sh2
-rw-r--r--t/insthook.sh2
-rw-r--r--t/instman.sh2
-rw-r--r--t/instman2.sh2
-rw-r--r--t/instmany-mans.sh2
-rw-r--r--t/instmany-python.sh16
-rw-r--r--t/instmany.sh2
-rw-r--r--t/instspc.tap2
-rw-r--r--t/interp.sh2
-rw-r--r--t/interp2.sh2
-rw-r--r--t/java-check.sh2
-rw-r--r--t/java-clean.sh2
-rw-r--r--t/java-compile-install.sh7
-rw-r--r--t/java-compile-run-flat.sh10
-rw-r--r--t/java-compile-run-nested.sh20
-rw-r--r--t/java-empty-classpath.sh2
-rw-r--r--t/java-extra.sh2
-rw-r--r--t/java-mix.sh2
-rw-r--r--t/java-no-duplicate.sh2
-rw-r--r--t/java-nobase.sh2
-rw-r--r--t/java-noinst.sh2
-rw-r--r--t/java-rebuild.sh2
-rw-r--r--t/java-sources.sh2
-rw-r--r--t/java-uninstall.sh7
-rw-r--r--t/java.sh2
-rw-r--r--t/java2.sh2
-rw-r--r--t/java3.sh2
-rw-r--r--t/javadir-undefined.sh2
-rw-r--r--t/javaflags.sh2
-rw-r--r--t/javaprim.sh2
-rw-r--r--t/javasubst.sh2
-rw-r--r--t/ldadd.sh2
-rw-r--r--t/ldflags.sh2
-rw-r--r--t/lex-clean-cxx.sh2
-rw-r--r--t/lex-clean.sh2
-rw-r--r--t/lex-depend-cxx.sh2
-rw-r--r--t/lex-depend-grep.sh2
-rw-r--r--t/lex-depend.sh2
-rw-r--r--t/lex-header.sh2
-rw-r--r--t/lex-lib-external.sh2
-rw-r--r--t/lex-lib.sh2
-rw-r--r--t/lex-libobj.sh2
-rw-r--r--t/lex-line.sh2
-rw-r--r--t/lex-multiple.sh2
-rw-r--r--t/lex-nodist.sh2
-rw-r--r--t/lex-noyywrap.sh2
-rw-r--r--t/lex-pr204.sh2
-rw-r--r--t/lex-subobj-nodep.sh2
-rw-r--r--t/lex.sh2
-rw-r--r--t/lex2.sh2
-rw-r--r--t/lex3.sh2
-rw-r--r--t/lex5.sh2
-rw-r--r--t/lexcpp.sh2
-rw-r--r--t/lexvpath.sh2
-rw-r--r--t/lflags-cxx.sh2
-rw-r--r--t/lflags.sh2
-rw-r--r--t/libexec.sh2
-rw-r--r--t/libobj-basic.sh2
-rw-r--r--t/libobj-no-dependency-tracking.sh2
-rw-r--r--t/libobj10.sh2
-rw-r--r--t/libobj12.sh2
-rw-r--r--t/libobj13.sh2
-rw-r--r--t/libobj14.sh2
-rw-r--r--t/libobj15a.sh2
-rw-r--r--t/libobj15b.sh2
-rw-r--r--t/libobj15c.sh2
-rw-r--r--t/libobj16a.sh2
-rw-r--r--t/libobj16b.sh2
-rw-r--r--t/libobj17.sh2
-rw-r--r--t/libobj18.sh2
-rw-r--r--t/libobj19.sh2
-rw-r--r--t/libobj2.sh2
-rw-r--r--t/libobj20a.sh2
-rw-r--r--t/libobj20b.sh2
-rw-r--r--t/libobj20c.sh2
-rw-r--r--t/libobj3.sh2
-rw-r--r--t/libobj4.sh2
-rw-r--r--t/libobj5.sh2
-rw-r--r--t/libobj7.sh2
-rw-r--r--t/library.sh2
-rw-r--r--t/library2.sh2
-rw-r--r--t/library3.sh2
-rw-r--r--t/libtoo10.sh2
-rw-r--r--t/libtoo11.sh2
-rw-r--r--t/libtool-macros.sh2
-rw-r--r--t/libtool.sh2
-rw-r--r--t/libtool2.sh2
-rw-r--r--t/libtool3.sh2
-rw-r--r--t/libtool4.sh2
-rw-r--r--t/libtool5.sh2
-rw-r--r--t/libtool6.sh2
-rw-r--r--t/libtool7.sh2
-rw-r--r--t/libtool8.sh2
-rw-r--r--t/libtool9.sh2
-rw-r--r--t/license.sh2
-rw-r--r--t/license2.sh2
-rw-r--r--t/link_c_cxx.sh2
-rw-r--r--t/link_cond.sh2
-rw-r--r--t/link_dist.sh2
-rw-r--r--t/link_f90_only.sh2
-rw-r--r--t/link_f_only.sh2
-rw-r--r--t/link_fc.sh2
-rw-r--r--t/link_fccxx.sh2
-rw-r--r--t/link_fcxx.sh2
-rw-r--r--t/link_override.sh9
-rw-r--r--t/lisp-flags.sh2
-rw-r--r--t/lisp-loadpath.sh2
-rw-r--r--t/lisp-pr11806.sh2
-rw-r--r--t/lisp-readonly-srcdir.sh2
-rw-r--r--t/lisp-subdir-mix.sh2
-rw-r--r--t/lisp-subdir.sh2
-rw-r--r--t/lisp-subdir2.sh2
-rw-r--r--t/lisp2.sh2
-rw-r--r--t/lisp3.sh2
-rw-r--r--t/lisp4.sh2
-rw-r--r--t/lisp5.sh2
-rw-r--r--t/lisp6.sh2
-rw-r--r--t/lisp7.sh2
-rw-r--r--t/lisp8.sh2
-rw-r--r--t/lispdry.sh2
-rw-r--r--t/list-of-tests.mk5
-rw-r--r--t/listval.sh2
-rw-r--r--t/local.mk2
-rw-r--r--t/location.sh2
-rw-r--r--t/longlin2.sh2
-rw-r--r--t/longline.sh2
-rw-r--r--t/ltcond.sh2
-rw-r--r--t/ltcond2.sh2
-rw-r--r--t/ltconv.sh2
-rw-r--r--t/ltdeps.sh2
-rw-r--r--t/ltinit.sh2
-rw-r--r--t/ltinstloc.sh2
-rw-r--r--t/ltlibobjs.sh2
-rw-r--r--t/ltlibsrc.sh2
-rw-r--r--t/ltorder.sh2
-rw-r--r--t/m4-inclusion.sh2
-rw-r--r--t/maintclean-vpath.sh2
-rw-r--r--t/maintclean.sh2
-rw-r--r--t/maintmode-configure-msg.sh2
-rw-r--r--t/make-dryrun.tap2
-rw-r--r--t/make-is-gnu.sh2
-rw-r--r--t/make-keepgoing.tap2
-rw-r--r--t/make.sh2
-rw-r--r--t/makefile-deps.sh2
-rw-r--r--t/makej.sh2
-rw-r--r--t/makej2.sh2
-rw-r--r--t/maken.sh2
-rw-r--r--t/maken3.sh2
-rw-r--r--t/makevars.sh2
-rw-r--r--t/man.sh2
-rw-r--r--t/man2.sh2
-rw-r--r--t/man3.sh2
-rw-r--r--t/man5.sh2
-rw-r--r--t/man6.sh2
-rw-r--r--t/man7.sh2
-rw-r--r--t/man8.sh2
-rw-r--r--t/mdate.sh2
-rw-r--r--t/mdate2.sh2
-rw-r--r--t/mdate3.sh2
-rw-r--r--t/mdate4.sh2
-rw-r--r--t/mdate5.sh2
-rw-r--r--t/mdate6.sh2
-rw-r--r--t/missing-auxfile-stops-makefiles-creation.sh2
-rw-r--r--t/missing-version-mismatch.sh2
-rw-r--r--t/missing3.sh2
-rw-r--r--t/mkdir_p.sh2
-rw-r--r--t/mkdirp-deprecation.sh2
-rw-r--r--t/mkinst2.sh2
-rw-r--r--t/mkinst3.sh2
-rw-r--r--t/mkinstall.sh2
-rw-r--r--t/mmode.sh2
-rw-r--r--t/mmodely.sh2
-rw-r--r--t/no-extra-c-stuff.sh2
-rw-r--r--t/no-extra-makefile-code.sh2
-rw-r--r--t/no-spurious-install-recursive.sh2
-rw-r--r--t/nobase-libtool.sh2
-rw-r--r--t/nobase-nodist.sh2
-rw-r--r--t/nobase-python.sh2
-rw-r--r--t/nobase.sh2
-rw-r--r--t/nodef.sh2
-rw-r--r--t/nodef2.sh2
-rw-r--r--t/nodep.sh2
-rw-r--r--t/nodep2.sh2
-rw-r--r--t/nodepcomp.sh2
-rw-r--r--t/nodist.sh2
-rw-r--r--t/nodist2.sh2
-rw-r--r--t/nodist3.sh2
-rw-r--r--t/noinst.sh2
-rw-r--r--t/noinstdir.sh2
-rw-r--r--t/nolink.sh2
-rw-r--r--t/nostdinc.sh2
-rw-r--r--t/notrans.sh2
-rw-r--r--t/number.sh2
-rw-r--r--t/objc-basic.sh2
-rw-r--r--t/objc-deps.sh2
-rw-r--r--t/objc-flags.sh2
-rw-r--r--t/objc-megademo.sh2
-rw-r--r--t/objc-minidemo.sh2
-rw-r--r--t/objcxx-basic.sh2
-rw-r--r--t/objcxx-deps.sh2
-rw-r--r--t/objcxx-flags.sh2
-rw-r--r--t/objcxx-minidemo.sh2
-rw-r--r--t/objext-pr10128.sh2
-rw-r--r--t/oldvars.sh2
-rw-r--r--t/order.sh2
-rw-r--r--t/output-order.sh2
-rw-r--r--t/output.sh2
-rw-r--r--t/output10.sh2
-rw-r--r--t/output11.sh2
-rw-r--r--t/output12.sh2
-rw-r--r--t/output13.sh2
-rw-r--r--t/output2.sh2
-rw-r--r--t/output3.sh2
-rw-r--r--t/output4.sh2
-rw-r--r--t/output5.sh2
-rw-r--r--t/output6.sh2
-rw-r--r--t/output7.sh2
-rw-r--r--t/output8.sh2
-rw-r--r--t/output9.sh2
-rw-r--r--t/override-conditional-1.sh2
-rw-r--r--t/override-conditional-2.sh2
-rw-r--r--t/override-conditional-pr13940.sh2
-rw-r--r--t/override-html.sh2
-rw-r--r--t/override-suggest-local.sh2
-rw-r--r--t/parallel-am.sh2
-rw-r--r--t/parallel-am2.sh2
-rw-r--r--t/parallel-am3.sh2
-rw-r--r--t/parallel-tests-basics.sh2
-rw-r--r--t/parallel-tests-cmdline-override.sh2
-rw-r--r--t/parallel-tests-concurrency-2.sh2
-rw-r--r--t/parallel-tests-concurrency.sh2
-rw-r--r--t/parallel-tests-console-output.sh2
-rw-r--r--t/parallel-tests-driver-install.sh2
-rw-r--r--t/parallel-tests-dry-run-1.sh2
-rw-r--r--t/parallel-tests-dry-run-2.sh2
-rw-r--r--t/parallel-tests-empty-testlogs.sh2
-rw-r--r--t/parallel-tests-empty.sh2
-rw-r--r--t/parallel-tests-exeext.sh2
-rw-r--r--t/parallel-tests-exit-status-reported.sh2
-rw-r--r--t/parallel-tests-exit-statuses.sh2
-rw-r--r--t/parallel-tests-extra-programs.sh2
-rw-r--r--t/parallel-tests-fd-redirect-exeext.sh2
-rw-r--r--t/parallel-tests-fd-redirect.sh2
-rw-r--r--t/parallel-tests-fork-bomb.sh2
-rw-r--r--t/parallel-tests-generated-and-distributed.sh2
-rw-r--r--t/parallel-tests-harderror.sh2
-rw-r--r--t/parallel-tests-interrupt.tap2
-rw-r--r--t/parallel-tests-log-compiler-1.sh2
-rw-r--r--t/parallel-tests-log-compiler-2.sh2
-rw-r--r--t/parallel-tests-log-compiler-example.sh2
-rw-r--r--t/parallel-tests-log-override-1.sh2
-rw-r--r--t/parallel-tests-log-override-2.sh2
-rw-r--r--t/parallel-tests-log-override-recheck.sh2
-rw-r--r--t/parallel-tests-no-color-in-log.sh2
-rw-r--r--t/parallel-tests-no-spurious-summary.sh2
-rw-r--r--t/parallel-tests-once.sh2
-rw-r--r--t/parallel-tests-recheck-depends-on-all.sh2
-rw-r--r--t/parallel-tests-recheck-pr11791.sh2
-rw-r--r--t/parallel-tests-recheck.sh2
-rw-r--r--t/parallel-tests-reset-term.sh2
-rw-r--r--t/parallel-tests-subdir.sh2
-rw-r--r--t/parallel-tests-suffix-prog.sh2
-rw-r--r--t/parallel-tests-suffix.sh2
-rw-r--r--t/parallel-tests-trailing-whitespace.sh2
-rw-r--r--t/parallel-tests-unreadable.sh2
-rw-r--r--t/parse.sh2
-rw-r--r--t/per-target-flags.sh2
-rw-r--r--t/percent.sh2
-rw-r--r--t/percent2.sh2
-rwxr-xr-xt/perf/cond.sh2
-rwxr-xr-xt/perf/testsuite-recheck.sh2
-rwxr-xr-xt/perf/testsuite-summary.sh2
-rw-r--r--t/phony.sh2
-rw-r--r--t/pkg-config-macros.sh2
-rw-r--r--t/pluseq.sh2
-rw-r--r--t/pluseq10.sh2
-rw-r--r--t/pluseq11.sh2
-rw-r--r--t/pluseq2.sh2
-rw-r--r--t/pluseq3.sh2
-rw-r--r--t/pluseq4.sh2
-rw-r--r--t/pluseq5.sh2
-rw-r--r--t/pluseq6.sh2
-rw-r--r--t/pluseq7.sh2
-rw-r--r--t/pluseq8.sh2
-rw-r--r--t/pluseq9.sh2
-rw-r--r--t/pm/Cond2.pl2
-rw-r--r--t/pm/Cond3.pl2
-rw-r--r--t/pm/Condition-t.pl2
-rw-r--r--t/pm/Condition.pl2
-rw-r--r--t/pm/DisjCon2.pl2
-rw-r--r--t/pm/DisjCon3.pl2
-rw-r--r--t/pm/DisjConditions-t.pl2
-rw-r--r--t/pm/DisjConditions.pl2
-rw-r--r--t/pm/General.pl2
-rw-r--r--t/pm/Version.pl2
-rw-r--r--t/pm/Version2.pl2
-rw-r--r--t/pm/Version3.pl2
-rw-r--r--t/pm/Wrap.pl2
-rw-r--r--t/posixsubst-data.sh2
-rw-r--r--t/posixsubst-extradist.sh2
-rw-r--r--t/posixsubst-ldadd.sh2
-rw-r--r--t/posixsubst-libraries.sh2
-rw-r--r--t/posixsubst-ltlibraries.sh2
-rw-r--r--t/posixsubst-programs.sh2
-rw-r--r--t/posixsubst-scripts.sh2
-rw-r--r--t/posixsubst-sources.sh2
-rw-r--r--t/posixsubst-tests.sh2
-rw-r--r--t/ppf77.sh2
-rw-r--r--t/pr2.sh2
-rw-r--r--t/pr211.sh2
-rw-r--r--t/pr220.sh2
-rw-r--r--t/pr224.sh2
-rw-r--r--t/pr229.sh2
-rw-r--r--t/pr243.sh2
-rw-r--r--t/pr266.sh2
-rw-r--r--t/pr279-2.sh2
-rw-r--r--t/pr279.sh2
-rw-r--r--t/pr287.sh2
-rw-r--r--t/pr300-lib.sh2
-rw-r--r--t/pr300-ltlib.sh2
-rw-r--r--t/pr300-prog.sh2
-rw-r--r--t/pr307.sh2
-rw-r--r--t/pr401.sh2
-rw-r--r--t/pr401b.sh2
-rw-r--r--t/pr401c.sh2
-rw-r--r--t/pr72.sh2
-rw-r--r--t/pr87.sh2
-rw-r--r--t/pr9.sh2
-rw-r--r--t/precious.sh2
-rw-r--r--t/prefix.sh2
-rw-r--r--t/preproc-basics.sh2
-rw-r--r--t/preproc-c-compile.sh2
-rw-r--r--t/preproc-demo.sh2
-rw-r--r--t/preproc-errmsg.sh2
-rw-r--r--t/primary-prefix-couples-documented-valid.sh2
-rw-r--r--t/primary-prefix-couples-force-valid.sh2
-rw-r--r--t/primary-prefix-invalid-couples.tap2
-rw-r--r--t/primary-prefix-valid-couples.sh2
-rw-r--r--t/primary.sh2
-rw-r--r--t/primary2.sh2
-rw-r--r--t/primary3.sh2
-rw-r--r--t/print-libdir.sh2
-rw-r--r--t/proginst.sh2
-rw-r--r--t/programs-primary-rewritten.sh2
-rw-r--r--t/py-compile-basedir.sh2
-rw-r--r--t/py-compile-basic.sh2
-rw-r--r--t/py-compile-destdir.sh2
-rw-r--r--t/py-compile-env.sh2
-rw-r--r--t/py-compile-option-terminate.sh2
-rw-r--r--t/py-compile-usage.sh2
-rw-r--r--t/python-am-path-iftrue.sh2
-rw-r--r--t/python-dist.sh2
-rw-r--r--t/python-missing.sh2
-rw-r--r--t/python-pr10995.sh2
-rwxr-xr-xt/python-prefix.sh91
-rw-r--r--t/python-too-old.sh2
-rw-r--r--t/python-vars.sh41
-rw-r--r--t/python-virtualenv.sh4
-rw-r--r--t/python.sh2
-rw-r--r--t/python10.sh2
-rw-r--r--t/python11.sh2
-rw-r--r--t/python12.sh2
-rw-r--r--t/python2.sh2
-rw-r--r--t/python3.sh2
-rw-r--r--t/recurs-user-deeply-nested.sh2
-rw-r--r--t/recurs-user-indir.sh2
-rw-r--r--t/recurs-user-keep-going.sh2
-rw-r--r--t/recurs-user-many.sh2
-rw-r--r--t/recurs-user-no-subdirs.sh2
-rw-r--r--t/recurs-user-no-top-level.sh2
-rw-r--r--t/recurs-user-override.sh2
-rw-r--r--t/recurs-user-phony.sh2
-rw-r--r--t/recurs-user-wrap.sh2
-rw-r--r--t/recurs-user.sh2
-rw-r--r--t/recurs-user2.sh2
-rw-r--r--t/relativize.tap2
-rw-r--r--t/remake-aclocal-version-mismatch.sh2
-rw-r--r--t/remake-after-acinclude-m4.sh2
-rw-r--r--t/remake-after-aclocal-m4.sh2
-rw-r--r--t/remake-after-configure-ac.sh2
-rw-r--r--t/remake-after-makefile-am.sh2
-rw-r--r--t/remake-all-1.sh2
-rw-r--r--t/remake-all-2.sh2
-rw-r--r--t/remake-am-pr10111.sh2
-rw-r--r--t/remake-config-status-dependencies.sh2
-rw-r--r--t/remake-configure-dependencies.sh2
-rw-r--r--t/remake-deeply-nested.sh2
-rw-r--r--t/remake-deleted-am-2.sh2
-rw-r--r--t/remake-deleted-am-subdir.sh2
-rw-r--r--t/remake-deleted-am.sh2
-rw-r--r--t/remake-deleted-m4-file.sh2
-rw-r--r--t/remake-fail.sh2
-rw-r--r--t/remake-gnulib-add-acsubst.sh2
-rw-r--r--t/remake-gnulib-add-header.sh2
-rw-r--r--t/remake-gnulib-remove-header.sh2
-rw-r--r--t/remake-include-aclocal.sh2
-rw-r--r--t/remake-include-configure.sh2
-rw-r--r--t/remake-include-makefile.sh2
-rw-r--r--t/remake-m4-pr10111.sh2
-rw-r--r--t/remake-macrodir.sh2
-rw-r--r--t/remake-maintainer-mode.sh2
-rw-r--r--t/remake-makefile-intree.sh2
-rw-r--r--t/remake-makefile-vpath.sh2
-rw-r--r--t/remake-mild-stress.sh2
-rw-r--r--t/remake-moved-m4-file.sh2
-rw-r--r--t/remake-not-after-make-dist.sh2
-rw-r--r--t/remake-recurs-user.sh2
-rw-r--r--t/remake-renamed-am.sh2
-rw-r--r--t/remake-renamed-m4-file.sh2
-rw-r--r--t/remake-renamed-m4-macro-and-file.sh2
-rw-r--r--t/remake-renamed-m4-macro.sh2
-rw-r--r--t/remake-subdir-from-subdir.sh2
-rw-r--r--t/remake-subdir-gnu.sh2
-rw-r--r--t/remake-subdir-grepping.sh2
-rw-r--r--t/remake-subdir-long-time.sh2
-rw-r--r--t/remake-subdir-no-makefile.sh2
-rw-r--r--t/remake-subdir-only.sh2
-rw-r--r--t/remake-subdir.sh2
-rw-r--r--t/remake-subdir2.sh2
-rw-r--r--t/remake-subdir3.sh2
-rw-r--r--t/remake-timing-bug-pr8365.sh2
-rw-r--r--t/repeated-options.sh2
-rw-r--r--t/reqd2.sh2
-rw-r--r--t/rm-f-probe.sh2
-rw-r--r--t/rulepat.sh2
-rw-r--r--t/sanity.sh2
-rw-r--r--t/seenc.sh2
-rw-r--r--t/self-check-cc-no-c-o.sh2
-rw-r--r--t/self-check-configure-help.sh2
-rw-r--r--t/self-check-dir.tap2
-rw-r--r--t/self-check-exit.tap2
-rw-r--r--t/self-check-explicit-skips.sh2
-rw-r--r--t/self-check-is-blocked-signal.tap2
-rw-r--r--t/self-check-is_newest.tap2
-rw-r--r--t/self-check-me.tap2
-rw-r--r--t/self-check-report.sh2
-rw-r--r--t/self-check-seq.tap2
-rw-r--r--t/self-check-shell-no-trail-bslash.sh2
-rw-r--r--t/self-check-unindent.tap2
-rw-r--r--t/serial-tests.sh2
-rw-r--r--t/silent-c.sh2
-rw-r--r--t/silent-configsite.sh2
-rw-r--r--t/silent-custom.sh2
-rw-r--r--t/silent-cxx.sh2
-rw-r--r--t/silent-f77.sh2
-rw-r--r--t/silent-f90.sh2
-rw-r--r--t/silent-gen.sh2
-rw-r--r--t/silent-lex.sh2
-rw-r--r--t/silent-lt.sh2
-rw-r--r--t/silent-many-languages.sh2
-rw-r--r--t/silent-nested-vars.sh2
-rw-r--r--t/silent-texi.sh2
-rw-r--r--t/silent-yacc-headers.sh2
-rw-r--r--t/silent-yacc.sh2
-rw-r--r--t/sourcefile-in-subdir.sh2
-rw-r--r--t/space.sh2
-rw-r--r--t/specflg-dummy.sh2
-rw-r--r--t/specflg6.sh2
-rw-r--r--t/specflg7.sh2
-rw-r--r--t/specflg8.sh2
-rw-r--r--t/specflg9.sh2
-rw-r--r--t/spell.sh2
-rw-r--r--t/spell2.sh2
-rw-r--r--t/spell3.sh2
-rw-r--r--t/spelling.sh2
-rw-r--r--t/spy-double-colon.sh2
-rw-r--r--t/spy-rm.tap2
-rw-r--r--t/src-acsubst.sh2
-rw-r--r--t/stamph2.sh2
-rw-r--r--t/stdinc.sh2
-rw-r--r--t/stdlib.sh2
-rw-r--r--t/stdlib2.sh2
-rw-r--r--t/strictness-override.sh2
-rw-r--r--t/strictness-precedence.sh2
-rw-r--r--t/strip.sh2
-rw-r--r--t/strip2.sh2
-rw-r--r--t/strip3.sh2
-rw-r--r--t/subdir-ac-subst.sh2
-rw-r--r--t/subdir-add-pr46.sh2
-rw-r--r--t/subdir-add2-pr46.sh2
-rw-r--r--t/subdir-am-cond.sh2
-rw-r--r--t/subdir-cond-err.sh2
-rw-r--r--t/subdir-cond-gettext.sh2
-rw-r--r--t/subdir-distclean.sh2
-rw-r--r--t/subdir-env-interference.sh2
-rw-r--r--t/subdir-keep-going-pr12554.sh2
-rw-r--r--t/subdir-order.sh2
-rw-r--r--t/subdir-subsub.sh2
-rw-r--r--t/subdir-with-slash.sh2
-rw-r--r--t/subdir.sh2
-rw-r--r--t/subobj-clean-lt-pr10697.sh2
-rw-r--r--t/subobj-clean-pr10697.sh2
-rw-r--r--t/subobj-indir-pr13928.sh2
-rw-r--r--t/subobj-objname-clash.sh2
-rw-r--r--t/subobj-pr13928-more-langs.sh2
-rw-r--r--t/subobj-vpath-pr13928.sh2
-rw-r--r--t/subobj.sh4
-rw-r--r--t/subobj10.sh2
-rw-r--r--t/subobj11a.sh2
-rw-r--r--t/subobj11b.sh2
-rw-r--r--t/subobj11c.sh2
-rw-r--r--t/subobj2.sh2
-rw-r--r--t/subobj4.sh2
-rw-r--r--t/subobj5.sh2
-rw-r--r--t/subobj6.sh2
-rw-r--r--t/subobj7.sh2
-rw-r--r--t/subobj8.sh2
-rw-r--r--t/subobj9.sh2
-rw-r--r--t/subobjname.sh2
-rw-r--r--t/subpkg-macrodir.sh2
-rw-r--r--t/subpkg-yacc.sh2
-rw-r--r--t/subpkg.sh2
-rw-r--r--t/subpkg2.sh2
-rw-r--r--t/subpkg3.sh2
-rw-r--r--t/subpkg4.sh2
-rw-r--r--t/subst-no-trailing-empty-line.sh2
-rw-r--r--t/subst.sh2
-rw-r--r--t/subst3.sh2
-rw-r--r--t/subst4.sh2
-rw-r--r--t/subst5.sh2
-rw-r--r--t/substre2.sh2
-rw-r--r--t/substref.sh2
-rw-r--r--t/substtarg.sh2
-rw-r--r--t/suffix-chain.tap2
-rw-r--r--t/suffix-custom-pr14441.sh2
-rw-r--r--t/suffix-custom-subobj-and-specflg.sh2
-rw-r--r--t/suffix-custom-subobj.sh2
-rw-r--r--t/suffix-extra-c-stuff-pr14560.sh2
-rw-r--r--t/suffix.sh2
-rw-r--r--t/suffix10.tap2
-rw-r--r--t/suffix11.tap2
-rw-r--r--t/suffix2.sh2
-rw-r--r--t/suffix3.tap2
-rw-r--r--t/suffix4.sh2
-rw-r--r--t/suffix5.sh2
-rw-r--r--t/suffix6.sh2
-rw-r--r--t/suffix6b.sh2
-rw-r--r--t/suffix6c.sh2
-rw-r--r--t/suffix7.sh2
-rw-r--r--t/suffix8.tap2
-rw-r--r--t/suffix9.sh2
-rw-r--r--t/symlink.sh2
-rw-r--r--t/symlink2.sh2
-rw-r--r--t/syntax.sh2
-rwxr-xr-xt/tags-lisp-space.sh2
-rw-r--r--t/tags-pr12372.sh2
-rw-r--r--t/tags.sh2
-rw-r--r--t/tags2.sh2
-rw-r--r--t/tagsub.sh2
-rw-r--r--t/tap-ambiguous-directive.sh2
-rw-r--r--t/tap-autonumber.sh2
-rw-r--r--t/tap-bad-prog.tap2
-rw-r--r--t/tap-bailout-and-logging.sh2
-rw-r--r--t/tap-bailout-leading-space.sh2
-rw-r--r--t/tap-bailout-suppress-badexit.sh2
-rw-r--r--t/tap-bailout-suppress-later-diagnostic.sh2
-rw-r--r--t/tap-bailout-suppress-later-errors.sh2
-rw-r--r--t/tap-bailout.sh2
-rw-r--r--t/tap-basic.sh2
-rw-r--r--t/tap-color.sh2
-rw-r--r--t/tap-common-setup.sh2
-rw-r--r--t/tap-deps.sh2
-rw-r--r--t/tap-diagnostic-custom.sh2
-rw-r--r--t/tap-diagnostic.sh2
-rw-r--r--t/tap-doc.sh2
-rw-r--r--t/tap-doc2.sh2
-rw-r--r--t/tap-driver-stderr.sh2
-rw-r--r--t/tap-empty-diagnostic.sh2
-rw-r--r--t/tap-empty.sh2
-rw-r--r--t/tap-escape-directive-2.sh2
-rw-r--r--t/tap-escape-directive.sh2
-rw-r--r--t/tap-exit.sh2
-rw-r--r--t/tap-fancy.sh2
-rw-r--r--t/tap-fancy2.sh2
-rw-r--r--t/tap-global-log.sh2
-rw-r--r--t/tap-global-result.sh2
-rw-r--r--t/tap-log.sh2
-rw-r--r--t/tap-merge-stdout-stderr.sh2
-rw-r--r--t/tap-missing-plan-and-bad-exit.sh2
-rw-r--r--t/tap-more.sh2
-rw-r--r--t/tap-more2.sh2
-rw-r--r--t/tap-msg0-bailout.sh2
-rw-r--r--t/tap-msg0-directive.sh2
-rw-r--r--t/tap-msg0-misc.sh2
-rw-r--r--t/tap-msg0-planskip.sh2
-rw-r--r--t/tap-msg0-result.sh2
-rw-r--r--t/tap-negative-numbers.sh2
-rw-r--r--t/tap-no-disable-hard-error.sh2
-rw-r--r--t/tap-no-merge-stdout-stderr.sh2
-rw-r--r--t/tap-no-spurious-numbers.sh2
-rw-r--r--t/tap-no-spurious-summary.sh2
-rw-r--r--t/tap-no-spurious.sh2
-rw-r--r--t/tap-not-ok-skip.sh2
-rw-r--r--t/tap-number-wordboundary.sh2
-rw-r--r--t/tap-numbers-leading-zero.sh2
-rw-r--r--t/tap-numeric-description.sh2
-rw-r--r--t/tap-out-of-order.sh2
-rw-r--r--t/tap-passthrough-exit.sh2
-rw-r--r--t/tap-passthrough.sh2
-rw-r--r--t/tap-plan-corner.sh2
-rw-r--r--t/tap-plan-errors.sh2
-rw-r--r--t/tap-plan-leading-zero.sh2
-rw-r--r--t/tap-plan-malformed.sh2
-rw-r--r--t/tap-plan-middle.sh2
-rw-r--r--t/tap-plan-whitespace.sh2
-rw-r--r--t/tap-plan.sh2
-rw-r--r--t/tap-planskip-and-logging.sh2
-rw-r--r--t/tap-planskip-badexit.sh2
-rw-r--r--t/tap-planskip-bailout.sh2
-rw-r--r--t/tap-planskip-case-insensitive.sh2
-rw-r--r--t/tap-planskip-late.sh2
-rw-r--r--t/tap-planskip-later-errors.sh2
-rw-r--r--t/tap-planskip-unplanned-corner.sh2
-rw-r--r--t/tap-planskip-unplanned.sh2
-rw-r--r--t/tap-planskip-whitespace.sh2
-rw-r--r--t/tap-planskip.sh2
-rw-r--r--t/tap-recheck-logs.sh2
-rw-r--r--t/tap-recheck.sh2
-rw-r--r--t/tap-result-comment.sh2
-rw-r--r--t/tap-signal.tap2
-rw-r--r--t/tap-summary-color.sh2
-rw-r--r--t/tap-summary.sh2
-rw-r--r--t/tap-test-number-0.sh2
-rw-r--r--t/tap-todo-skip-together.sh2
-rw-r--r--t/tap-todo-skip-whitespace.sh2
-rw-r--r--t/tap-todo-skip.sh2
-rw-r--r--t/tap-unplanned.sh2
-rw-r--r--t/tap-whitespace-normalization.sh2
-rw-r--r--t/tap-with-and-without-number.sh2
-rw-r--r--t/tap-xfail-tests.sh2
-rw-r--r--t/tar-opts-errors.sh2
-rw-r--r--t/tar-override.sh2
-rw-r--r--t/tar-pax.sh2
-rw-r--r--t/tar-ustar-id-too-high.sh2
-rw-r--r--t/tar-ustar.sh2
-rw-r--r--t/target-cflags.sh2
-rw-r--r--t/targetclash.sh2
-rw-r--r--t/test-driver-acsubst.sh2
-rw-r--r--t/test-driver-cond.sh2
-rw-r--r--t/test-driver-create-log-dir.sh9
-rw-r--r--t/test-driver-custom-multitest-recheck.sh2
-rw-r--r--t/test-driver-custom-multitest-recheck2.sh2
-rw-r--r--t/test-driver-custom-multitest.sh2
-rw-r--r--t/test-driver-custom-no-extra-driver.sh2
-rw-r--r--t/test-driver-custom-xfail-tests.sh2
-rw-r--r--t/test-driver-custom.sh2
-rw-r--r--t/test-driver-fail.sh2
-rw-r--r--t/test-driver-is-distributed.sh2
-rw-r--r--t/test-driver-strip-vpath.sh2
-rw-r--r--t/test-driver-trs-suffix-registered.sh2
-rw-r--r--t/test-extensions-cond.sh2
-rwxr-xr-xt/test-extensions-empty.sh2
-rw-r--r--t/test-extensions.sh2
-rw-r--r--t/test-harness-vpath-rewrite.sh2
-rw-r--r--t/test-log.sh2
-rw-r--r--t/test-logs-repeated.sh2
-rw-r--r--t/test-metadata-global-log.sh2
-rw-r--r--t/test-metadata-global-result.sh2
-rw-r--r--t/test-metadata-recheck.sh2
-rw-r--r--t/test-metadata-results.sh2
-rw-r--r--t/test-missing.sh2
-rw-r--r--t/test-missing2.sh2
-rw-r--r--t/test-trs-basic.sh2
-rw-r--r--t/test-trs-recover.sh2
-rw-r--r--t/test-trs-recover2.sh2
-rw-r--r--t/tests-environment-and-log-compiler.sh2
-rw-r--r--t/tests-environment-backcompat.sh2
-rw-r--r--t/tests-environment-fd-redirect.sh11
-rw-r--r--t/tests-environment.sh2
-rw-r--r--t/testsuite-summary-color.sh2
-rw-r--r--t/testsuite-summary-count-many.sh2
-rw-r--r--t/testsuite-summary-count.sh2
-rw-r--r--t/testsuite-summary-header.sh2
-rw-r--r--t/testsuite-summary-reference-log.sh2
-rw-r--r--t/toplevelmd.sh67
-rw-r--r--t/transform.sh2
-rw-r--r--t/transform2.sh6
-rw-r--r--t/transform3.sh2
-rw-r--r--t/txinfo-absolute-srcdir-pr408.sh2
-rw-r--r--t/txinfo-add-missing-and-dist.sh2
-rw-r--r--t/txinfo-bsd-make-recurs.sh2
-rw-r--r--t/txinfo-builddir.sh2
-rw-r--r--t/txinfo-clean.sh2
-rw-r--r--t/txinfo-dvi-recurs.sh2
-rw-r--r--t/txinfo-include.sh2
-rw-r--r--t/txinfo-info-in-srcdir.sh2
-rw-r--r--t/txinfo-makeinfo-error-no-clobber.sh2
-rw-r--r--t/txinfo-many-output-formats-vpath.sh2
-rw-r--r--t/txinfo-many-output-formats.sh2
-rw-r--r--t/txinfo-no-clutter.sh2
-rw-r--r--t/txinfo-no-extra-dist.sh2
-rw-r--r--t/txinfo-no-installinfo.sh2
-rw-r--r--t/txinfo-no-repeated-targets.sh2
-rw-r--r--t/txinfo-no-setfilename.sh2
-rw-r--r--t/txinfo-nodist-info.sh2
-rw-r--r--t/txinfo-other-suffixes.sh2
-rw-r--r--t/txinfo-override-infodeps.sh2
-rw-r--r--t/txinfo-override-texinfo-tex.sh2
-rw-r--r--t/txinfo-setfilename-repeated.sh2
-rw-r--r--t/txinfo-setfilename-suffix-strip.sh2
-rw-r--r--t/txinfo-subdir-pr343.sh2
-rw-r--r--t/txinfo-tex-dist.sh2
-rw-r--r--t/txinfo-unrecognized-extension.sh2
-rw-r--r--t/txinfo-unrecognized-info-suffix.sh2
-rw-r--r--t/txinfo-vtexi.sh2
-rw-r--r--t/txinfo-vtexi2.sh2
-rw-r--r--t/txinfo-vtexi3.sh2
-rw-r--r--t/txinfo-vtexi4.sh2
-rw-r--r--t/txinfo-without-info-suffix.sh2
-rw-r--r--t/txinfo19.sh2
-rw-r--r--t/txinfo23.sh2
-rw-r--r--t/txinfo24.sh2
-rw-r--r--t/txinfo25.sh2
-rw-r--r--t/txinfo28.sh2
-rw-r--r--t/uninstall-fail.sh2
-rw-r--r--t/uninstall-pr9578.sh2
-rw-r--r--t/unused.sh2
-rw-r--r--t/upc.sh2
-rw-r--r--t/upc2.sh2
-rw-r--r--t/upc3.sh2
-rw-r--r--t/vala-configure.sh2
-rw-r--r--t/vala-grepping.sh2
-rw-r--r--t/vala-headers.sh8
-rw-r--r--t/vala-libs-distcheck.sh2
-rw-r--r--t/vala-libs-vpath.sh2
-rw-r--r--t/vala-libs.sh2
-rw-r--r--t/vala-mix.sh2
-rw-r--r--t/vala-mix2.sh2
-rw-r--r--t/vala-non-recursive-setup.sh2
-rw-r--r--t/vala-parallel.sh2
-rw-r--r--t/vala-per-target-flags.sh2
-rw-r--r--t/vala-recursive-setup.sh2
-rw-r--r--t/vala-vapi.sh2
-rw-r--r--t/vala-vpath.sh2
-rw-r--r--t/var-recurs.sh2
-rw-r--r--t/var-recurs2.sh2
-rw-r--r--t/vars.sh2
-rw-r--r--t/vars3.sh2
-rw-r--r--t/vartar.sh2
-rw-r--r--t/vartypo2.sh2
-rw-r--r--t/vartypos.sh2
-rw-r--r--t/version3.sh2
-rw-r--r--t/version4.sh2
-rw-r--r--t/version6.sh2
-rw-r--r--t/version7.sh2
-rw-r--r--t/version8.sh2
-rw-r--r--t/vpath.sh2
-rw-r--r--t/warning-groups-win-over-strictness.sh2
-rw-r--r--t/warnings-obsolete-default.sh2
-rw-r--r--t/warnings-override.sh2
-rw-r--r--t/warnings-precedence.sh2
-rw-r--r--t/warnings-strictness-interactions.sh2
-rw-r--r--t/warnings-unknown.sh2
-rw-r--r--t/warnings-win-over-strictness.sh2
-rw-r--r--t/warnopts.sh2
-rw-r--r--t/werror.sh2
-rw-r--r--t/werror2.sh2
-rw-r--r--t/werror3.sh2
-rw-r--r--t/werror4.sh2
-rw-r--r--t/whoami.sh2
-rw-r--r--t/xsource.sh2
-rw-r--r--t/yacc-auxdir.sh2
-rw-r--r--t/yacc-basic.sh2
-rw-r--r--t/yacc-bison-skeleton-cxx.sh2
-rw-r--r--t/yacc-bison-skeleton.sh2
-rw-r--r--t/yacc-clean-cxx.sh2
-rw-r--r--t/yacc-clean.sh2
-rw-r--r--t/yacc-cxx-grepping.sh2
-rw-r--r--t/yacc-cxx.sh2
-rw-r--r--t/yacc-d-basic.sh2
-rw-r--r--t/yacc-d-cxx.sh2
-rw-r--r--t/yacc-d-vpath.sh2
-rw-r--r--t/yacc-deleted-headers.sh2
-rw-r--r--t/yacc-depend.sh2
-rw-r--r--t/yacc-depend2.sh2
-rw-r--r--t/yacc-dist-nobuild-subdir.sh2
-rw-r--r--t/yacc-dist-nobuild.sh2
-rw-r--r--t/yacc-dry.sh2
-rw-r--r--t/yacc-grepping.sh2
-rw-r--r--t/yacc-grepping2.sh2
-rw-r--r--t/yacc-headers-and-dist-pr47.sh2
-rw-r--r--t/yacc-line.sh2
-rw-r--r--t/yacc-misc.sh2
-rw-r--r--t/yacc-mix-c-cxx.sh2
-rw-r--r--t/yacc-nodist.sh2
-rw-r--r--t/yacc-pr204.sh2
-rw-r--r--t/yacc-subdir.sh2
-rw-r--r--t/yacc-vpath.sh2
-rw-r--r--t/yacc-weirdnames.sh2
-rw-r--r--t/yflags-cmdline-override.sh2
-rw-r--r--t/yflags-conditional.sh2
-rw-r--r--t/yflags-cxx.sh2
-rw-r--r--t/yflags-d-false-positives.sh2
-rw-r--r--t/yflags-force-conditional.sh2
-rw-r--r--t/yflags-force-override.sh2
-rw-r--r--t/yflags-var-expand.sh2
-rw-r--r--t/yflags.sh2
1476 files changed, 6949 insertions, 4808 deletions
diff --git a/ChangeLog b/ChangeLog
index e03349988..7707fa866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,467 @@
+2021-07-25 Jim Meyering <meyering@fb.com>
+
+ version 1.16.4
+
+ * configure.ac (AC_INIT): Bump version number to 1.16.4.
+ * m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
+ * NEWS: Record release version.
+
+2021-07-22 Karl Berry <karl@freefriends.org>
+
+ maint: Update files from upstream with 'make fetch'.
+
+ * lib/gendocs.sh: Update.
+
+2021-07-18 Jim Meyering <meyering@fb.com>
+
+ maint: adjust version, post-snapshot
+
+ * configure.ac (AC_INIT): Bump version number to 1.16e for snapshot.
+ * m4/amversion.m4: Regenerate.
+
+2021-07-18 Jim Meyering <meyering@fb.com>
+
+ maint: adjust version for snapshot
+
+ * configure.ac (AC_INIT): Bump version number to 1.16d for snapshot.
+ * m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
+
+2021-07-18 Jim Meyering <meyering@fb.com>
+
+ doc: NEWS tweak
+
+ * NEWS: Indent consistently.
+
+2021-07-17 Karl Berry <karl@freefriends.org>
+
+ doc: update HACKING.
+
+ * HACKING: update for some current realities.
+
+2021-07-15 Jacob Bachmeyer <jcb@gnu.org>
+
+ tests: use testsuite/ directory in DejaGnu tests
+
+ Patch posted:
+ https://lists.gnu.org/archive/html/automake-patches/2021-07/msg00009.html
+
+ * t/check12.sh: Consistently use the directory name, testsuite/,
+ for all DejaGnu tests, and always use recursive make to run
+ DejaGnu, for backward and forward compatibility.
+ * t/dejagnu3.sh: Likewise.
+ * t/dejagnu4.sh: Likewise.
+ * t/dejagnu5.sh: Likewise.
+ * t/dejagnu6.sh: Likewise.
+ * t/dejagnu7.sh: Likewise.
+ * t/dejagnu-absolute-builddir.sh: Likewise.
+ * t/dejagnu-relative-srcdir.sh: Likewise.
+ * t/dejagnu-siteexp-extend.sh: Likewise.
+ * t/dejagnu-siteexp-useredit.sh: Likewise.
+ * NEWS: mention this.
+ * THANKS: new contributor.
+
+2021-07-15 Nick Gasson <nick@nickg.me.uk>
+
+ automake: silent make output for custom link commands.
+
+ Patch posted:
+ https://lists.gnu.org/archive/html/automake-patches/2021-07/msg00010.html
+
+ * bin/automake.in (define_per_target_linker_variable): Use
+ AM_V_${target}_LINK if defined as the verbose variable name for
+ custom link commands.
+ * doc/automake.texi (Program and Library Variables): Document the new
+ variable.
+ * t/link_override.sh: Add extra checks for silent make rules.
+ * NEWS: Mention this.
+ * THANKS: new contributor.
+
+2021-07-11 meyering <meyering@hx.meyering.net.(none)>
+
+ maint: avoid syntax-check failures
+
+ * maintainer/syntax-checks.mk (toupper): Tighten the regexp
+ to avoid a new false-match in t/python-prefix.sh.
+ * t/instmany-python.sh: Use run_make in place of some $MAKE uses.
+ * t/python-prefix.sh: Likewise.
+ * t/python-vars.sh: Likewise.
+
+2021-07-11 Jim Meyering <meyering@fb.com>
+
+ maint: make update-copyright
+
+2021-07-11 Allison Karlitskaya <allison.karlitskaya@redhat.com>
+
+ maint: tweak comment wording
+
+ * doc/automake.texi (List of Automake options): Nit.
+ * t/dist-no-built-sources.sh: Likewise.
+
+2021-07-11 Jim Meyering <meyering@fb.com>
+
+ no-dist-built-sources: fix-up
+
+ * bin/automake.in (preprocess_file): Process new option here,
+ (handle_dist): ... not here.
+ * lib/Automake/Options.pm (_is_valid_easy_option):
+ Remove pure-dist.
+ * lib/am/distdir.am: Don't factor out the duplicate-looking
+ $(MAKE)... command. Otherwise, many dist-using tests would fail
+ for me, e.g., t/aclocal-amflags.sh.
+
+2021-07-11 Jim Meyering <meyering@fb.com>
+
+ test: disable use of ksh in a test that would otherwise hang
+
+ * t/tests-environment-fd-redirect.sh: This test would hang when
+ using ksh93 from Fedora 34 and CentOS 8. Comments demonstrate
+ the issue reported as https://github.com/ksh93/ksh/issues/316
+
+2021-07-11 Karl Berry <karl@freefriends.org>
+
+ doc: update THANKS.
+
+ * THANKS: mention contributors over the past couple years.
+
+2021-07-09 Allison Karlitskaya <allison.karlitskaya@redhat.com>
+
+ dist: add new "dist-no-built-sources" automake option.
+
+ Fixes automake bug https://debbugs.gnu.org/49317.
+
+ * bin/automake.in: implement new option "no-dist-built-sources" to
+ omit the dependency of distdir on $(BUILT_SOURCES). (Allison's
+ original patch used the option name dist-pure; trivially renamed.)
+ * lib/am/distdir.am (distdir) [DIST_BUILT_SOURCES]: conditionalize
+ the dependency.
+ * lib/Automake/Options.pm (_is_valid_easy_option): list it.
+ * doc/automake.texi (List of Automake options): document it.
+ * NEWS: mention it.
+ * t/dist-no-built-sources.sh: test it.
+ * t/list-of-tests.mk (handwritten_TESTS): add it.
+
+2021-07-07 Karl Berry <karl@freefriends.org>
+
+ maint: missed commits.
+
+ * INSTALL: Update from gnulib via make fetch.
+ * NEWS: mention config.{guess,sub} restoration of `...`.
+
+2021-07-05 Karl Berry <karl@freefriends.org>
+
+ maint: Update files from upstream with 'make fetch'
+
+ * lib/INSTALL: Update.
+ * lib/config.guess: Likewise.
+ * lib/config.sub: Likewise.
+ * lib/gendocs.sh: Likewise.
+ * lib/gendocs_template: Likewise.
+ * lib/gitlog-to-changelog: Likewise.
+ * lib/gnupload: Likewise.
+ * lib/texinfo.tex: Likewise.
+ * lib/update-copyright: Likewise.
+
+2021-07-05 Karl Berry <karl@freefriends.org>
+
+ tests: forgot to remove dev exit 33 from new test.
+
+ * t/toplevelmd.sh: normal ending.
+
+2021-07-01 Karl Berry <karl@freefriends.org>
+
+ dist: accept .md versions for README et al.
+
+ This change was suggested by madmurphy; some ideas were taken
+ from the patch he provided.
+ https://lists.gnu.org/archive/html/automake-patches/2021-06/msg00005.html
+
+ * bin/automake.in (@toplevelmd_ok): new global, listing the files
+ for which we will accept .md versions.
+ (@common_files): remove those files from there.
+ (handle_dist): check for .md if non-.md is absent.
+ (handle_minor_options): check for README-alpha.md.
+ (check_gnu_standards): accept .md version if present.
+ (check_gnits_standards): likewise.
+ (usage): output list of .md-accepted files.
+ * doc/automake.texi (Basics of Distribution): document.
+
+ * t/toplevelmd.sh: new test.
+ * t/list-of-tests.mk (handwritten_tests): add it.
+ * NEWS: mention new feature.
+
+2021-06-08 Karl Berry <karl@freefriends.org>
+
+ doc: omit "really" from manual.
+
+ * doc/automake.texi: remove or replace "really".
+
+2021-06-07 Karl Berry <karl@freefriends.org>
+
+ doc: --always-make doesn't work.
+
+ * doc/automake.texi (Rebuilding): the GNU Make option
+ --always-make does not work with Automake.
+ Report from Johan Persson,
+ https://lists.gnu.org/archive/html/automake/2021-06/msg00002.html.
+ Also, use "GNU Make" (capital M) more consistently.
+
+2021-05-18 Karl Berry <karl@freefriends.org>
+
+ doc: wording.
+
+ * README:
+ * t/python-virtualenv.sh:
+ * doc/automake.texi: wording, typos, etc.
+
+2021-05-18 Karl Berry <karl@freefriends.org>
+
+ doc: move future 2.0 incompatibilities to separate file.
+
+ * NEWS: move info to ...
+ * NEWS-2.0: ... this new file.
+ * Makefile.am (EXTRA_DIST): add it.
+
+2021-05-18 Karl Berry <karl@freefriends.org>
+
+ python: new python-prefix test.
+
+ * t/python-prefix.sh: new test.
+ * t/list-of-tests.mk (handwritten_tests): add it.
+ * NEWS: describe new Python prefix behavior.
+
+2021-05-18 Joshua Root <jmr@macports.org>
+
+ python: use Python's sys.prefix and sys.exec_prefix
+
+ for PYTHON_PREFIX and PYTHON_EXEC_PREFIX; new configure options
+ --with-python_prefix and --with-python_exec_prefix to set explicitly.
+
+ This change fixes https://bugs.gnu.org/35322.
+
+ * m4/python.m4 (AM_PATH_PYTHON): use Python's sys.prefix and
+ sys.exec_prefix for PYTHON_PREFIX and PYTHON_EXEC_PREFIX,
+ instead of $prefix and $exec_prefix. But use a variable
+ reference to ${prefix} if it is contained within sys.prefix;
+ similarly for exec_prefix. Also support new configure options
+ to set explicitly.
+ (PYTHON_PREFIX, PYTHON_EXEC_PREFIX): AC_SUBST these.
+ (am_cv_python_pythondir): use our new $am_cv_python_prefix,
+ substituting ${PYTHON_PREFIX}.
+ (am_cv_python_pyexecdir): likewise.
+ * doc/automake.texi (Python): PYTHON_PREFIX, PYTHON_EXEC_PREFIX,
+ document new approach.
+ * t/instmany-python.sh: set PYTHON_PREFIX as needed.
+ * t/python-vars.sh (PYTHON_EXEC_PREFIX, PYTHON_PREFIX): also set from
+ Python's sys.{exec_,}prefix; use ${PYTHON_{EXEC,}PREFIX} instead
+ of ${exec_,}prefix.
+
+2021-05-12 Karl Berry <karl@freefriends.org>
+
+ doc: HACKING updates.
+
+ * HACKING: some additional tidbits.
+
+2021-02-27 Dirk Mueller <josef.moellers@suse.com>
+
+ automake: sort hash keys needed for reproducible output.
+
+ This change fixes https://bugs.gnu.org/46744.
+
+ * bin/automake.in: sort keys, in: handle_LIBOBJS, handle_clean,
+ handle_factored_dependencies, scan_autoconf_traces,
+ lang_vala_finish.
+ * NEWS: mention this.
+
+2021-02-22 Karl Berry <karl@freefriends.org>
+
+ doc: a_LDFLAGS always overrides AM_LDFLAGS.
+
+ This change addresses https://bugs.gnu.org/34925.
+
+ * doc/automake.texi (Program and Library Variables): document
+ that using a_LDFLAGS at all, even in the false branch of a
+ conditional, means that AM_LDFLAGS is ignored.
+
+2021-02-21 Mike Frysinger <vapier@gentoo.org>
+
+ doc: [AM_]RUNTESTFLAGS not [AM_]RUNTESTDEFAULTFLAGS.
+
+ * doc/automake.texi (Other Variables): Change [AM_]RUNTESTDEFAULTFLAGS
+ to [AM_]RUNTESTFLAGS.
+
+2021-02-11 Karl Berry <karl@freefriends.org>
+
+ doc: user flags last does not always allow overriding.
+
+ This change addresses https://bugs.gnu.org/35526.
+
+ * doc/automake.texi (Flag Variables Ordering): recognize that
+ user flags last does not always allow overriding.
+
+2021-01-06 Karl Berry <karl@freefriends.org>
+
+ doc: discuss AC_* ordering a little.
+
+ * doc/automake.texi (Optional): mention that AC_CONFIG_AUX_DIR
+ must be called before AM_INIT_AUTOMAKE, and recommend that other
+ AC_CONFIG_* macros be called after. This seems to be the most
+ common practice. Autoconf does not currently impose ordering:
+ https://savannah.gnu.org/support/?110416
+
+2020-12-14 Zack Weinberg <zackw@panix.com>
+
+ Fix some build and test failures with Autoconf 2.70.
+
+ Autoconf 2.70 (released last week) makes a few changes that broke Automake’s
+ expectations, mostly in the test suite. This patch addresses two of the
+ problems:
+
+ - autoconf now issues a warning if fed a configure script that doesn’t invoke
+ both AC_INIT and AC_OUTPUT; this, plus a problem with system-provided
+ tools (still under investigation) broke the *build* on macOS; it also
+ causes a couple of spurious testsuite failures.
+
+ - AC_PACKAGE_NAME and AC_PACKAGE_VERSION are now defined unconditionally.
+ AM_INIT_AUTOMAKE needs to use m4_ifset instead of m4_ifdef to diagnose
+ the obsolete use of AC_INIT with fewer than two arguments. (This change
+ is compatible with autoconf 2.69; m4_ifset is much older, and it means
+ ‘defined with a non-empty value’.)
+
+ * configure.ac: Use both AC_INIT and AC_OUTPUT in test configure scripts.
+ * t/deprecated-acinit.sh, t/init.sh: Likewise.
+ * m4/init.m4 (AM_INIT_AUTOMAKE): Use m4_ifset, not m4_ifdef, to detect
+ AC_PACKAGE_NAME and/or AC_PACKAGE_VERSION not having a value.
+
+2020-12-13 Karl Berry <karl@freefriends.org>
+
+ python: don't assume $(...) in py-compile.
+
+ This change (very) partially fixes https://bugs.gnu.org/45205.
+
+ * lib/py-compile: use `...` instead of $(...).
+ Solaris 10 /bin/sh is still in use.
+
+2020-12-09 Karl Berry <karl@freefriends.org>
+
+ tests: more .NOTPARALLEL tests.
+
+ * t/java-compile-run-nested.sh: .NOTPARALLEL in subdirs too.
+
+2020-12-08 Karl Berry <karl@freefriends.org>
+
+ tests: more .NOTPARALLEL tests.
+
+ * contrib/t/multilib.sh: yet more .NOTPARALLEL for AM_TESTSUITE_MAKE,
+ found by Jim on heavier machines.
+ * t/autodist-stamp-vti.sh: likewise.
+ * t/java-compile-run-nested.sh: likewise.
+ * t/transform2.sh: likewise.
+
+2020-12-07 Karl Berry <karl@freefriends.org>
+
+ tests: more .NOTPARALLEL tests.
+
+ * contrib/t/multilib.sh: use .NOTPARALLEL to avoid unreproducible
+ (and undebuggable, by me) test failures when running
+ make -j$njobs AM_TESTSUITE_MAKE="make -j$njobs"
+ for some arbitrary but rather large value of $njobs.
+ The failures don't occur with just make -j; have to run the makes
+ inside the tests in parallel also.
+ * t/java-compile-install.sh: likewise.
+ * t/java-compile-run-flat.sh: likewise.
+ * t/java-uninstall.sh: likewise.
+ * t/vala-headers.sh: likewise.
+
+2020-12-05 Karl Berry <karl@freefriends.org>
+
+ doc: comment Vala -newer test.
+
+ This change updates https://bugs.gnu.org/44772.
+
+ * bin/automake.in (lang_vala_finish_target): comment that
+ we're checking "C file not older than Vala file", and the
+ log message misleadingly says "reversed".
+
+2020-12-05 Reuben Thomas <rrt@sc3d.org>
+
+ tags: support setting CTAGS, ETAGS, CSCOPE vars via ./configure.
+
+ This change fixes https://bugs.gnu.org/45013.
+
+ * m4/init.m4: add default settings and AC_SUBST calls for the variables
+ `CTAGS', `ETAGS' and `CSCOPE'.
+ * lib/am/tags.am: remove default settings of the above variables.
+ * doc/automake.texi (Tags): mention and index.
+ * NEWS: mention.
+
+2020-12-03 Karl Berry <karl@freefriends.org>
+
+ warnings: be less forceful about a missing subdir-objects option.
+
+ This change somewhat ameliorates https://bugs.gnu.org/20699.
+
+ * bin/automake.in (handle_single_transform): change
+ forward-incompatibility message for subdir-objects to be
+ less draconian and less certain that the change will ever be made.
+ * t/subobj.sh: message text has changed.
+ * doc/automake.texi (Program and Library Variables): mention
+ the unfortunate fact that one directory can clean in a sibling,
+ subdir-objects notwithstanding.
+
+2020-11-27 Karl Berry <karl@freefriends.org>
+
+ tests: .NOTPARALLEL test-driver-create-log-dir.
+
+ * t/test-driver-create-log-dir.sh (.NOTPARALLEL): add target,
+ since the two tests under sub/ seem to have a race condition.
+ No evident way to debug or reliably reproduce. Reported by Jim.
+
+2020-11-27 Reuben Thomas <rrt@sc3d.org>
+
+ vala: avoid wrong regeneration of C files.
+
+ This change might fix https://bugs.gnu.org/44772.
+
+ * bin/automake.in (lang_val_finish_target): reverse -newer test
+ to handle files being created at the same time causing
+ spurious rebuilds.
+
+2020-11-24 Karl Berry <karl@freefriends.org>
+
+ doc: typo.
+
+ This change fixes https://bugs.gnu.org/44845.
+
+ * doc/automake.texi (Vala Support): zardoz.c not zardoc.c.
+
+2020-11-23 Karl Berry <karl@freefriends.org>
+
+ tests: create log file before running the test script.
+
+ This change partially fixes https://bugs.gnu.org/35762.
+
+ * lib/test-driver: create $log_file before running the
+ test script. Also quote $log_file. Combined suggestions
+ from howaboutsynergy and Eric Blake.
+
+2020-11-22 Karl Berry <karl@freefriends.org>
+
+ doc: mention overriding SUBDIRS= with TESTS= and recursive make.
+
+ This change palliates https://bugs.gnu.org/42883,
+ though it's not a real fix.
+
+ * doc/automake.texi (Parallel Test Harness): with recursive
+ make, when limiting the tests run, also presumably needed to
+ override SUBDIRS.
+
+2020-11-18 Jim Meyering <meyering@fb.com>
+
+ maint: Post-release administrivia
+
+ * configure.ac (AC_INIT): Bump version number to 1.16b.
+ * m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
+
2020-11-18 Jim Meyering <meyering@fb.com>
version 1.16.3
diff --git a/GNUmakefile b/GNUmakefile
index e729abbee..12a4782be 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,6 @@
# Maintainer makefile for Automake. Requires GNU make.
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/HACKING b/HACKING
index e8b7034e3..5f8644e71 100644
--- a/HACKING
+++ b/HACKING
@@ -1,24 +1,28 @@
============================================================================
= This file
-* This file attempts to describe the rules to use when hacking
- automake.
+* This file attempts to describe the conventions to use when hacking automake.
+
+* After git checkout from Savannah, can do initial build with, e.g.:
+ $ ./bootstrap && ./configure --prefix=/tmp/amdev && make
============================================================================
= Administrivia
* The correct response to most actual bugs is to write a new test case
which demonstrates the bug. Then fix the bug, re-run the test suite,
- and check everything in.
+ and check everything in. Run the test suite in parallel.
* If you incorporate a change from somebody on the net:
- - First, if it is a large change, you must make sure they have
+ - First, if it is not a tiny change, you must make sure they have
signed the appropriate paperwork.
- - Second, be sure to add their name and email address to THANKS.
+ - Second, add their name and email address to THANKS.
-* If a change fixes a test, mention the test in the commit message.
- If a change fixes a bug registered in the Automake debbugs tracker,
- mention the bug number in the commit message.
+* If a change fixes or adds a test, mention the test in the commit
+ message. If a change fixes a bug registered in the Automake debbugs
+ tracker, mention the bug number in the commit message, using
+ the short url form, like https://bugs.gnu.org/1234. See section below
+ about commit messages.
* If somebody reports a new bug, mention their name in the commit message
that fixes or exposes the bug, and add a line for them in THANKS.
@@ -27,15 +31,16 @@
sure to add a test case for it, and to reference such test case from
a proper Texinfo comment.
-* Some files in the automake package are not owned by automake; these
- files are listed in the $(FETCHFILES) variable in Makefile.am. They
- should never be edited here. Almost all of them can be updated from
- respective upstreams with "make fetch" (this should be done especially
- before releases). The only exception is the 'lib/COPYING' (from FSF),
- which should be updated by hand whenever the GPL gets updated (which
- shouldn't happen that often anyway :-)
+* Some files in the automake package are not owned by automake (many by
+ gnulib, https://gnu.org/s/gnulib); these files are listed in the
+ $(FETCHFILES) variable in Makefile.am. They should never be edited
+ here. All but one of them can be updated from respective upstreams
+ with "make fetch" (this should be done especially before releases).
+ The only exception is 'lib/COPYING' (from FSF), which should be
+ updated by hand whenever the GPL gets updated (which shouldn't happen
+ that often anyway :-)
-* Changes other than *trivial* bug fixes must be mentioned in NEWS.
+* All changes that are not trivial bug fixes must be mentioned in NEWS.
* Changes which are potentially controversial, require a non-trivial
plan, or must be implemented gradually with a roadmap spanning several
@@ -47,10 +52,26 @@
Automake debbugs tracker, to keep the idea more visible, and have the
discussions surrounding it easily archived in a central place.
+===========================================================================
+= Setting the development environment
+
+* In development, ./GNUmakefile is used, not (the generated) ./Makefile.
+ Run make V=1 to see the commands that are run.
+
+* The required and optional dependencies used by Automake and its test suite
+ can be automatically fetched using the GNU Guix package manager with the
+ following command:
+
+ $ guix environment automake --ad-hoc \
+ gettext help2man texinfo libtool flex bison dejagnu zip icedtea \
+ python gcc-toolchain gfortran pkg-config vala
+
+ For other environments, you'll need to install the equivalent.
+
============================================================================
= Naming
-* We've adopted the convention that internal AC_SUBSTs and make variables
+* Automake's convention is that internal AC_SUBSTs and make variables
should be named with a leading 'am__', and internally generated targets
should be named with a leading 'am--'. This convention, although in
place from at least February 2001, isn't yet universally used.
@@ -61,14 +82,20 @@
variable begins with the underscore character. Yay for them.
I changed the target naming convention just to be safe.
+* If you'd like to read some general background on automake and the
+ other GNU autotools, you might try this not-too-long web page (not
+ affiliated with GNU):
+ https://www.linux.com/news/best-practices-autotools/
+
============================================================================
= Editing '.am' files
-* Always use $(...) and not ${...}
+* For variables, always use $(...) and not ${...}.
* Prefer ':' over 'true', mostly for consistency with existing code.
-* Use '##' comments liberally. Comment anything even remotely unusual.
+* Use '##' comments liberally. Comment anything even remotely unusual,
+ and even usual things, to help future readers of the code understand.
* Never use basename or dirname. Instead, use sed.
@@ -139,23 +166,13 @@
* Major releases can introduce backward-incompatibilities (albeit such
incompatibilities should be announced well in advance, and a smooth
- transition plan prepared for them), and try more risking and daring
- refactorings and code cleanups.
+ transition plan prepared for them), and try more risky and daring
+ refactorings and code cleanups. Still, backward compatibilities are
+ extremely undesirable and should be avoided at all costs.
* For more information, refer to the extensive discussion associated
with automake bug#13578.
-===========================================================================
-= Setting the development environment
-
-* The required and optional dependencies used by Automake and its test suite
- can be automatically fetched using the GNU Guix package manager with the
- following command:
-
- $ guix environment automake --ad-hoc \
- gettext help2man texinfo libtool flex bison dejagnu zip icedtea \
- python gcc-toolchain gfortran pkg-config vala
-
============================================================================
= Working with git
@@ -165,7 +182,9 @@
be the same as you would get if you install this version of
automake and use it to generate those files. Be sure to have the
latest stable version of Autoconf installed and available early
- in your PATH.
+ in your PATH. To get a faithful and correct rebuild, run:
+ ./bootstrap && ./config.status --recheck && make clean all
+ (per https://bugs.gnu.org/11347)
* The Automake git tree currently carries three basic branches: 'master',
'next' and 'maint'.
@@ -213,6 +232,20 @@
it in the 'experimental/*' namespace; for example, a rewindable branch
dealing with Vala support could be named like "experimental/vala-work".
+* If you need to trivially fix a change after a commit, e.g., a typo in
+ the NEWS entry, edit the file and then:
+ git commit --amend --no-edit NEWS
+ git commit --amend --date="$(date -R)" # update date of commit
+
+* If you want to just completely lose your local changes:
+ git fetch && git reset --hard origin && git checkout && git submodule update
+ (the submodule stuff is for gnulib).
+
+* The preferred way to create a patch to mail around:
+ git format-patch --stdout -1 >/tmp/some-patch.diff
+ which can then be applied with:
+ git am mboxfile
+
============================================================================
= Writing a good commit message
@@ -252,19 +285,21 @@
* some/file (func1): Improved frobnication.
(func2): Adjusted accordingly.
* another/file (foo, bar): Likewise.
- * tests/foo.tap: New test.
- * tests/Makefile.am (TESTS): Add it.
+ * t/foo.sh: New test.
+ * t/list-of-tests.mk (handwritten_TESTS): Add it.
+ * doc/automake.texi (Some Node): Document it.
+ * NEWS: mention it.
* If your commit fixes an automake bug registered in the tracker (say
numbered 1234), you should put the following line after the summary
line:
- This change fixes automake bug#1234.
+ Fixes automake bug https://bugs.gnu.org/1234.
* If your commit is just related to the given bug report, but does not
fix it, you might want to add a line like this instead:
- This change is related to automake bug#1234.
+ Related to automake bug https://bugs.gnu.org/1234.
* When referring to older commits, use 'git describe' output as pointer.
But also try to identify the given commit by date and/or summary line
@@ -272,7 +307,7 @@
Since yesterday's commit, v1.11-2019-g4d2bf42, ...
- ... removed in commit 'v1.11-1674-g02e9072' of 01-01-2012,
+ ... removed in commit 'v1.11-1674-g02e9072' of 2012-01-01,
"dist: ditch support for lzma"...
* If the commit is a tiny change that is exempt from copyright paperwork, the
@@ -281,9 +316,13 @@
Copyright-paperwork-exempt: yes
+* Generally write the commit message in present tense.
+
============================================================================
= Test suite
+* See file 't/README' for more information.
+
* Use "make check" and "make maintainer-check" liberally.
* Export the 'keep_testdirs' environment variable to "yes" to keep
@@ -292,7 +331,94 @@
* Use perl coverage information to ensure your new code is thoroughly
tested by your new tests.
-* See file 't/README' for more information.
+* To run the tests, you should install expect, shar, language compilers,
+ gettext macros. Anything you don't install won't be tested. The test
+ suite will report on tests skipped due to software not available.
+
+* You can run a single test, with, e.g.,
+
+ make check TESTS='t/aclocal-acdir.sh'
+
+ where t/aclocal-acdir.sh can be any t/*.sh test, including a new one
+ you are writing. You may want to add --no-print-dir to silence GNU
+ make about the many cd commands, and/or env VERBOSE=1 to get more
+ information about what make is running.
+
+* Then check t/test-suite.log for the overall results. The directory
+ t/TESTNAME.dir is where the work will be left, if the test fails.
+ During development of a new test, you want to end it with "exit 33"
+ (or whatever) to make it fail even when it would succeed, so you can
+ inspect the test directory to be sure things worked as expected.
+
+ You can also set keep_testdirs=yes on the command line to keep the
+ *.dir results.
+
+* Run the test suite in parallel (e.g., "make -j12 check"), both so it
+ doesn't take forever and because that is what most users will do. You
+ can also parallelize the makes that run inside each test with, e.g.:
+
+ make check AM_TESTSUITE_MAKE="make -j$(( 1*$(nproc) + 1 ))"
+
+ If you like, try different levels of parallelization to see what
+ runs the fastest on your machine.
+
+* Run "make maintainer-check" before commit. Watch out for trailing spaces.
+
+* It is good to run also run "make -j12 distcheck" before pushing a
+ commit since that exercises yet more testing, after "make -j12 check"
+ succeeds.
+
+* Use make V=1 to un-silence (some) of what make does.
+
+* To set up a new test, first write the test file in t/good-name.sh.
+ Choose a name that fits with existing ones, as best you can devise.
+
+ - You'll likely want to copy material from an existing test, which is
+ fine and good; depending on how much is copied, it may be useful to
+ mention the other test(s) you used.
+
+ - Nevertheless, start the copyright year list in the new file fresh,
+ with the current year.
+
+ - You can run the new test on its own with
+ make check TESTS='t/good-name.sh'
+
+ - At some point before releasing, add the test to the appropriate
+ variable in t/list-of-tests.mk, most likely the (alphabetical)
+ handwritten_TESTS.
+
+============================================================================
+= Bug tracker
+
+* Automake uses the debbugs instance at https://bugs.gnu.org. Email
+ from the tracker is sent to bug-automake@gnu.org, and vice versa.
+ (https://gnu.org/s/automake for all the mailing lists; you should subscribe.)
+
+* To see all open bugs (and recently closed ones):
+ https://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=automake
+
+* For a full search form, initialized to show bugs tagged confirmed:
+ https://debbugs.gnu.org/cgi/pkgreport.cgi?package=automake;include=tags%3Aconfirmed
+
+* We use the "confirmed" tag to mean bugs that have been reviewed, are
+ evidently valid, but no one is currently working or plans to work on
+ them. Thus they are good candidates for new volunteers to get involved.
+
+* To download the so-called maintainer mbox for a bug, say 12345:
+ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=12345;mbox=yes;mboxmaint=yes
+ Only the maintainer mbox consistently has the bug# prefix on Subject:
+ lines, so it is generally the most usable.
+
+* To close a bug, you can mail (or bcc) to 12345-done@debbugs.gnu.org.
+ It's best to do this with a note saying that the bug is being closed
+ because the fix was pushed, or whatever the reason.
+
+* To add tags "help" and "confirmed" to bug 12345, mail to
+ control@debbugs.gnu.org with a one-line body:
+ tags 35322 + help confirmed
+
+* In general, all bug operations are done by mail. Reference information:
+ https://debbugs.gnu.org/server-control.html # dev info
============================================================================
= Release procedure
@@ -305,7 +431,7 @@
running "make fetch". In case any file in the automake repository
has been updated, commit and re-run the testsuite.
-* Ensure that the copyright notices of the distributed files is up to
+* Ensure that the copyright notices of the distributed files are up to
date. The maintainer-only target "update-copyright" can help with
this.
@@ -391,7 +517,7 @@
-----
-Copyright (C) 2003-2020 Free Software Foundation, Inc.
+Copyright (C) 2003-2021 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
diff --git a/INSTALL b/INSTALL
index 8865734f8..e82fd21de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
- Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX 'make' updates targets which have the same time stamps as their
+ HP-UX 'make' updates targets which have the same timestamps as their
prerequisites, which makes it generally unusable when shipped generated
files such as 'configure' are involved. Use GNU 'make' instead.
diff --git a/Makefile.am b/Makefile.am
index d8a9da1b5..0dcef2673 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 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
@@ -36,6 +36,7 @@ EXTRA_DIST += \
bootstrap \
GNUmakefile \
HACKING \
+ NEWS-2.0 \
PLANS
# We want a handful of substitutions to be fully-expanded by make;
diff --git a/Makefile.in b/Makefile.in
index 3190a663f..bbe2d048f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 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
@@ -106,15 +106,7 @@ build_triplet = @build@
host_triplet = @host@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
- $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/cond.m4 \
- $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/install-sh.m4 \
- $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/missing.m4 \
- $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/prog-cc-c-o.m4 \
- $(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
- $(top_srcdir)/m4/silent.m4 $(top_srcdir)/m4/strip.m4 \
- $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -254,9 +246,6 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope check recheck
am__tty_colors_dummy = \
mgn= red= grn= lgn= blu= brg= std=; \
@@ -486,6 +475,8 @@ AWK = @AWK@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -494,6 +485,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
F77 = @F77@
FC = @FC@
@@ -625,8 +617,8 @@ MAINTAINERCLEANFILES =
# Maintainer-specific files and scripts.
# XXX: This script should be updated with 'fetch' target.
-EXTRA_DIST = bootstrap GNUmakefile HACKING PLANS contrib/tap-driver.pl \
- contrib/check-html.am contrib/checklinkx \
+EXTRA_DIST = bootstrap GNUmakefile HACKING NEWS-2.0 PLANS \
+ contrib/tap-driver.pl contrib/check-html.am contrib/checklinkx \
contrib/multilib/README contrib/multilib/config-ml.in \
contrib/multilib/symlink-tree contrib/multilib/multilib.am \
contrib/multilib/multi.m4 contrib/README old/ChangeLog-tests \
@@ -1331,6 +1323,7 @@ t/dist-missing-m4.sh \
t/dist-readonly.sh \
t/dist-repeated.sh \
t/dist-pr109765.sh \
+t/dist-no-built-sources.sh \
t/dist-vs-built-sources.sh \
t/distcleancheck.sh \
t/distcom2.sh \
@@ -1769,6 +1762,7 @@ t/test-trs-recover.sh \
t/test-trs-recover2.sh \
t/test-extensions.sh \
t/test-extensions-cond.sh \
+t/toplevelmd.sh \
t/parse.sh \
t/percent.sh \
t/percent2.sh \
@@ -1847,6 +1841,7 @@ t/python-am-path-iftrue.sh \
t/python-missing.sh \
t/python-too-old.sh \
t/python-dist.sh \
+t/python-prefix.sh \
t/python-vars.sh \
t/python-virtualenv.sh \
t/python-pr10995.sh \
@@ -3238,7 +3233,6 @@ recheck: all
@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS) $(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
diff --git a/NEWS b/NEWS
index ec6915fcb..bb3e3ae47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,69 +1,45 @@
-* WARNING: Future backward-incompatibilities!
-
- - Makefile recipes generated by Automake 2.0 will expect to use an
- 'rm' program that doesn't complain when called without any non-option
- argument if the '-f' option is given (so that commands like "rm -f"
- and "rm -rf" will act as a no-op, instead of raising usage errors).
- This behavior of 'rm' is very widespread in the wild, and it will be
- required in the next POSIX version:
-
- <http://austingroupbugs.net/view.php?id=542>
-
- Accordingly, AM_INIT_AUTOMAKE now expands some shell code that checks
- that the default 'rm' program in PATH satisfies this requirement,
- aborting the configure process if this is not the case. For the
- moment, it's still possible to force the configuration process to
- succeed even with a broken 'rm', that that will no longer be the case
- for Automake 2.0.
-
- - Automake 2.0 will require Autoconf 2.70 or later (which is still
- unreleased at the moment of writing, but is planned to be released
- before Automake 2.0 is).
-
- - Automake 2.0 will drop support for the long-deprecated 'configure.in'
- name for the Autoconf input file. You are advised to start using the
- recommended name 'configure.ac' instead, ASAP.
-
- - The ACLOCAL_AMFLAGS special make variable will be fully deprecated in
- Automake 2.0: it will raise warnings in the "obsolete" category (but
- still no hard error of course, for compatibilities with the many, many
- packages that still relies on that variable). You are advised to
- start relying on the new Automake support for AC_CONFIG_MACRO_DIRS
- instead (which was introduced in Automake 1.13).
-
- - Automake 2.0 will remove support for automatic dependency tracking
- with the SGI C/C++ compilers on IRIX. The SGI depmode has been
- reported broken "in the wild" already, and we don't think investing
- time in debugging and fixing is worthwhile, especially considering
- that SGI has last updated those compilers in 2006, and retired
- support for them in December 2013:
- <http://www.sgi.com/services/support/irix_mips_support.html>
-
- - Automake 2.0 will remove support for MS-DOS and Windows 95/98/ME
- (support for them was offered by relying on the DJGPP project).
- Note however that both Cygwin and MSYS/MinGW on modern Windows
- versions will continue to be fully supported.
-
- - Automake-provided scripts and makefile recipes might (finally!)
- start assuming a POSIX shell in Automake 2.0. There still is no
- certainty about this though: we'd first like to wait and see
- whether future Autoconf versions will be enhanced to guarantee
- that such a shell is always found and provided by the checks in
- ./configure.
-
- - Starting from Automake 2.0, third-party m4 files located in the
- system-wide aclocal directory, as well as in any directory listed
- in the ACLOCAL_PATH environment variable, will take precedence
- over "built-in" Automake macros. For example (assuming Automake
- is installed in the /usr/local hierarchy), a definition of the
- AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4'
- should take precedence over the same-named automake-provided macro
- (defined in '/usr/local/share/aclocal-2.0/vala.m4').
+For planned incompatibilities in a future Automake 2.0 release,
+please see NEWS-2.0 and start following the advice there now.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in ?.?.?:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.16.4:
+
+* New features added
+
+ - The PYTHON_PREFIX and PYTHON_EXEC_PREFIX variables are now set from
+ Python's sys.prefix and sys.exec_prefix; use the new configure options
+ --with-python_prefix and --with-python_exec_prefix to specify explicitly.
+
+ - Common top-level files can be provided as .md; the non-md version is
+ used if both are present:
+ AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS
+
+ - CTAGS, ETAGS, SCOPE variables can be set via configure.
+
+ - Silent make output for custom link commands.
+
+ - New option "no-dist-built-sources" skips generating $(BUILT_SOURCES)
+ before building the tarball as part of "make dist", that is,
+ omits the dependency of $(distdir): $(BUILT_SOURCES).
+
+* Bugs fixed
+
+ - automake output more reproducible.
+
+ - test-driver less likely to clash with tests writing to the same file.
+
+ - DejaGnu tests always use the directory name, testsuite/, for
+ compatibility with the newer dejagnu-1.6.3 and with prior versions.
+
+* Distribution
+
+ - config.sub and config.guess updates include restoration of `...`
+ for maximum portability.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -76,7 +52,7 @@ New in 1.16.3:
* Bugs fixed
- - Python 3.10 version number no longer considered to be 3.1.
+ - Python version number 3.10 no longer considered to be 3.1.
- Broken links in manual fixed or removed, and new script
contrib/checklinkx (a small modification of W3C checklink) added,
@@ -3113,7 +3089,7 @@ New in 0.20:
-----
-Copyright (C) 1995-2020 Free Software Foundation, Inc.
+Copyright (C) 1995-2021 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
diff --git a/NEWS-2.0 b/NEWS-2.0
new file mode 100644
index 000000000..743138ca9
--- /dev/null
+++ b/NEWS-2.0
@@ -0,0 +1,97 @@
+This file (NEWS-2.0) lists several incompatibilities planned for a
+future Automake 2.0 release.
+
+However, the (few) current Automake maintainers have insufficient interest
+and energy to pursue the 2.0 release. We have not even reviewed all
+existing bugs. New maintainers are needed! For more information about
+helping with Automake development:
+https://lists.gnu.org/archive/html/automake/2021-03/msg00018.html
+
+Therefore, there is no ETA for Automake 2.0, but it is not likely to be
+any time soon. So moving these future issues to a separate file seemed
+warranted. For more info, see the ./PLANS/ directory.
+
+
+* WARNING: Future backward-incompatibilities!
+
+ - Makefile recipes generated by Automake 2.0 will expect to use an
+ 'rm' program that doesn't complain when called without any non-option
+ argument if the '-f' option is given (so that commands like "rm -f"
+ and "rm -rf" will act as a no-op, instead of raising usage errors).
+ This behavior of 'rm' is very widespread in the wild, and it will be
+ required in the next POSIX version:
+
+ <http://austingroupbugs.net/view.php?id=542>
+
+ Accordingly, AM_INIT_AUTOMAKE now expands some shell code that checks
+ that the default 'rm' program in PATH satisfies this requirement,
+ aborting the configure process if this is not the case. For the
+ moment, it's still possible to force the configuration process to
+ succeed even with a broken 'rm', but that will no longer be the case
+ for Automake 2.0.
+
+ - Automake 2.0 will require Autoconf 2.71 or later. Exact
+ dependencies are unknowable at ths time.
+
+ - Automake 2.0 will drop support for the long-deprecated 'configure.in'
+ name for the Autoconf input file. You are advised to start using the
+ recommended name 'configure.ac' instead, ASAP.
+
+ - The ACLOCAL_AMFLAGS special make variable will be fully deprecated in
+ Automake 2.0: it will raise warnings in the "obsolete" category (but
+ still no hard error of course, for compatibilities with the many, many
+ packages that still relies on that variable). You are advised to
+ start relying on the new Automake support for AC_CONFIG_MACRO_DIRS
+ instead (which was introduced in Automake 1.13).
+
+ - Automake 2.0 will remove support for automatic dependency tracking
+ with the SGI C/C++ compilers on IRIX. The SGI depmode has been
+ reported broken "in the wild" already, and we don't think investing
+ time in debugging and fixing is worthwhile, especially considering
+ that SGI has last updated those compilers in 2006, and retired
+ support for them in December 2013:
+ <http://www.sgi.com/services/support/irix_mips_support.html>
+
+ - Automake 2.0 will remove support for MS-DOS and Windows 95/98/ME
+ (support for them was offered by relying on the DJGPP project).
+ Note however that both Cygwin and MSYS/MinGW on modern Windows
+ versions will continue to be fully supported.
+
+ - Automake-provided scripts and makefile recipes might (finally!)
+ start assuming a POSIX shell in Automake 2.0. There still is no
+ certainty about this though: we'd first like to wait and see
+ whether future Autoconf versions will be enhanced to guarantee
+ that such a shell is always found and provided by the checks in
+ ./configure.
+
+ In 2020, config.guess was changed by its then-maintainer to require
+ $(...); the ensuing bug reports and maintenance hassle
+ (unfortunately the changes have not been reverted) are a convincing
+ argument that we should not require a POSIX shell until Solaris 10,
+ at least, is completely gone from the world.
+
+ - Starting from Automake 2.0, third-party m4 files located in the
+ system-wide aclocal directory, as well as in any directory listed
+ in the ACLOCAL_PATH environment variable, will take precedence
+ over "built-in" Automake macros. For example (assuming Automake
+ is installed in the /usr/local hierarchy), a definition of the
+ AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4'
+ should take precedence over the same-named automake-provided macro
+ (defined in '/usr/local/share/aclocal-2.0/vala.m4').
+
+-----
+
+Copyright (C) 1995-2021 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
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/README b/README
index d99282591..c9d0a9eb4 100644
--- a/README
+++ b/README
@@ -23,11 +23,11 @@ for aclocal is currently found in the Automake manual.
Automake has a test suite. Use "make check" to run it. For more
information, see the file t/README.
-Automake has a page on the web. See:
+Automake's home page:
https://www.gnu.org/software/automake/
-Automake also has three mailing lists:
+Automake has three mailing lists:
* automake@gnu.org
For general discussions of Automake and its interactions with other
@@ -40,8 +40,8 @@ Automake also has three mailing lists:
Where to send patches, and discuss the automake development process
and the design of new features.
-To obtain more information about these list, or to subscribe to them,
-refer to <https://www.gnu.org/software/automake/#mailinglists>
+To see the archives of these lists, or to (un)subscribe to them,
+refer to <https://www.gnu.org/software/automake/#mailinglists>.
New releases are announced to autotools-announce@gnu.org. If you want to
be informed, subscribe to that list by following the instructions at
@@ -52,7 +52,7 @@ the range specifies every single year in that closed interval.
-----
-Copyright (C) 1994-2020 Free Software Foundation, Inc.
+Copyright (C) 1994-2021 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
diff --git a/THANKS b/THANKS
index a2b8c29ec..6c8abf9b2 100644
--- a/THANKS
+++ b/THANKS
@@ -18,6 +18,7 @@ Alexander Turbov zaufi@sendmail.ru
Alexandre Duret-Lutz duret_g@epita.fr
Alexey Mahotkin alexm@hsys.msk.ru
Alfred M. Szmidt ams@gnu.org
+Allison Karlitskaya allison.karlitskaya@redhat.com
Andrea Urbani matfanjol@mail.com
Andreas Bergmeier lcid-fire@gmx.net
Andreas Buening andreas.buening@nexgo.de
@@ -71,6 +72,7 @@ Christina Gratorp christina.gratorp@gmail.com
Claudio Fontana sick_soul@yahoo.it
Clifford Wolf clifford@clifford.at
Colin Watson cjwatson@ubuntu.com
+Colomban Wendling lists.ban@herbesfolles.org
Dagobert Michelsen dam@opencsw.org
Daiki Ueno ueno@unixuser.org
Dalibor Topic robilad@kaffe.org
@@ -102,6 +104,7 @@ Diego Elio Pettenò flameeyes@flameeyes.eu
Dieter Baron dillo@stieltjes.smc.univie.ac.at
Dieter Jurzitza DJurzitza@harmanbecker.com
Дилян Палаузов dilyan.palauzov@aegee.org
+Dirk Mueller josef.moellers@suse.com
Dmitry Mikhin dmitrym@acres.com.au
Dmitry V. Levin ldv@altlinux.org
Doug Evans devans@cygnus.com
@@ -127,6 +130,7 @@ Ezra Peisach epeisach@MED-XTAL.BU.EDU
Fabian Alenius fabian.alenius@gmail.com
Federico Simoncelli fsimonce@redhat.com
Felix Salfelder felix@salfelder.org
+Felix Yan felixonmars@archlinux.org
Flavien Astraud flav42@yahoo.fr
Florian Briegel briegel@zone42.de
Francesco Salvestrini salvestrini@gmail.com
@@ -166,6 +170,7 @@ Imacat imacat@mail.imacat.idv.tw
Infirit infirit@gmail.com
Inoue inoue@ainet.or.jp
Jack Kelly jack@jackkelly.name
+Jacob Bachmeyer jcb@gnu.org
James Amundson amundson@users.sourceforge.net
James Bostock james.bostock@gmail.com
James Henstridge james@daa.com.au
@@ -209,6 +214,7 @@ Jonathan Nieder jrnieder@gmail.com
Joseph S. Myers joseph@codesourcery.com
Josh MacDonald jmacd@cs.berkeley.edu
Joshua Cowan jcowan@jcowan.reslife.okstate.edu
+Joshua Root jmr@macports.org
js pendry js.pendry@msdw.com
Juergen A. Erhard jae@laden.ilk.de
Juergen Keil jk@tools.de
@@ -234,8 +240,10 @@ Lars J. Aas larsa@sim.no
Laurent Morichetti laurentm@cup.hp.com
Leo Davis ldavis@fonix.com
Leonardo Boiko leoboiko@conectiva.com.br
+Libor Bukata libor.bukata@oracle.com
Loulou Pouchet loulou@lrde.epita.fr
Ludovic Courtès ludo@gnu.org
+Lukas Fleischer lfleischer@lfos.de
Luo Yi luoyi.ly@gmail.com
Maciej Stachowiak mstachow@mit.edu
Maciej W. Rozycki macro@ds2.pg.gda.pl
@@ -284,6 +292,7 @@ Miles Bader miles@ccs.mt.nec.co.jp
Miloslav Trmac trmac@popelka.ms.mff.cuni.cz
Miodrag Vallat miodrag@ifrance.com
Mirko Streckenbach strecken@infosun.fmi.uni-passau.de
+Miro Hroncok miro@hroncok.cz
Miroslaw Dobrzanski-Neumann mne@mosaic-ag.com
Morten Eriksen mortene@sim.no
Motoyuki Kasahara m-kasahr@sra.co.jp
@@ -292,6 +301,7 @@ Nelson H. F. Beebe beebe@math.utah.edu
Nicholas Wourms nwourms@netscape.net
Nick Bowler nbowler@elliptictech.com
Nick Brown brownn@brocade.com
+Nick Gasson nick@nickg.me.uk
Nicola Fontana ntd@entidi.it
Nicolas Joly njoly@pasteur.fr
Nicolas Thiery nthiery@Icare.mines.edu
@@ -317,6 +327,7 @@ Paul Eggert eggert@twinsun.com
Paul Jarc prj@po.cwru.edu
Paul Lunau temp@lunau.me.uk
Paul Martinolich martinol@datasync.com
+Paul Osmialowski pawel.osmialowski@arm.com
Paul Thomas PTHOMAS@novell.com
Pavel Raiskup praiskup@redhat.com
Pavel Roskin pavel_roskin@geocities.com
@@ -362,7 +373,9 @@ Rob Savoye rob@cygnus.com
Robert Bihlmeyer robbe@orcus.priv.at
Robert Boehne rboehne@ricardo-us.com
Robert Collins robert.collins@itdomain.com.au
+Robert Menteer reetnem@mac.com
Robert Swafford robert.swafford@l-3com.com
+Robert Wanamaker rlw@nycap.rr.com
Roberto Bagnara bagnara@cs.unipr.it
Roman Fietze roman.fietze@telemotive.de
Ronald Copley ronald.copley@gmail.com
@@ -375,6 +388,8 @@ Ryan T. Sammartino ryants@shaw.ca
Sam Hocevar sam@zoy.org
Sam Sirlin sam@kalessin.jpl.nasa.gov
Sam Steingold sds@gnu.org
+Samuel Tardieu sam@rfc1149.net
+Samy Mahmoudi samy.mahmoudi@gmail.com
Sander Niemeijer niemeijer@science-and-technology.nl
Santiago Vila sanvila@unex.es
Scott James Remnant scott@netsplit.com
diff --git a/aclocal.m4 b/aclocal.m4
index b076c2c97..9fdd1aa0d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,24 +14,833 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69d.4-8e54],,
-[m4_warning([this file was generated for autoconf 2.69d.4-8e54.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-m4_include([m4/amversion.m4])
-m4_include([m4/auxdir.m4])
-m4_include([m4/cond.m4])
-m4_include([m4/init.m4])
-m4_include([m4/install-sh.m4])
-m4_include([m4/lead-dot.m4])
-m4_include([m4/missing.m4])
-m4_include([m4/options.m4])
-m4_include([m4/prog-cc-c-o.m4])
-m4_include([m4/runlog.m4])
-m4_include([m4/sanity.m4])
-m4_include([m4/silent.m4])
-m4_include([m4/strip.m4])
-m4_include([m4/substnot.m4])
-m4_include([m4/tar.m4])
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.16'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.16.4], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.16.4])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Do all the work for Automake. -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
+else
+ am_missing_run=
+ AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
+
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/bin/aclocal.in b/bin/aclocal.in
index ca2f96324..f11244785 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -1,7 +1,7 @@
#!@PERL@
# aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*-
# @configure_input@
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/bin/automake.in b/bin/automake.in
index 31c72382a..f04f5d5f5 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1,7 +1,7 @@
#!@PERL@
# automake - create Makefile.in from Makefile.am -*- perl -*-
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 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
@@ -199,11 +199,14 @@ my @libtool_files = qw(ltmain.sh config.guess config.sub);
# ltconfig appears here for compatibility with old versions of libtool.
my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh);
-# Commonly found files we look for and automatically include in
-# DISTFILES.
+# Top-level files that can be foo.md instead of foo. We assume that all
+# but THANKS are required at strictness level gnu.
+my @toplevelmd_ok = qw(AUTHORS ChangeLog INSTALL NEWS README THANKS);
+
+# Commonly found files we look for and automatically include in DISTFILES.
my @common_files =
- (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
- COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
+ (qw(ABOUT-GNU ABOUT-NLS BACKLOG COPYING
+ COPYING.DOC COPYING.LIB COPYING.LESSER TODO
ar-lib compile config.guess config.rpath
config.sub depcomp install-sh libversion.in mdate-sh
missing mkinstalldirs py-compile texinfo.tex ylwrap),
@@ -1839,22 +1842,27 @@ sub handle_single_transform
{
# Since the next major version of automake (2.0) will
# make the behaviour so far only activated with the
- # 'subdir-object' option mandatory, it's better if we
+ # 'subdir-objects' option mandatory, it's better if we
# start warning users not using that option.
# As suggested by Peter Johansson, we strive to avoid
# the warning when it would be irrelevant, i.e., if
# all source files sit in "current" directory.
+ #
+ # There are problems with making this change; see
+ # https://bugs.gnu.org/20699 before making
+ # subdir-objects, let alone unconditional.
+ # (Making it non-overridable seems especially wrong.)
+ #
msg_var 'unsupported', $var,
"source file '$full' is in a subdirectory,"
. "\nbut option 'subdir-objects' is disabled";
msg 'unsupported', INTERNAL, <<'EOF', uniq_scope => US_GLOBAL;
possible forward-incompatibility.
-At least a source file is in a subdirectory, but the 'subdir-objects'
+At least one source file is in a subdirectory, but the 'subdir-objects'
automake option hasn't been enabled. For now, the corresponding output
-object file(s) will be placed in the top-level directory. However,
-this behaviour will change in future Automake versions: they will
-unconditionally cause object files to be placed in the same subdirectory
-of the corresponding sources.
+object file(s) will be placed in the top-level directory. However, this
+behavior may change in a future Automake major version, with object
+files being placed in the same subdirectory as the corresponding sources.
You are advised to start using 'subdir-objects' option throughout your
project, to avoid future incompatibilities.
EOF
@@ -2388,7 +2396,7 @@ sub handle_LIBOBJS
$var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
if ! keys %libsources;
- foreach my $iter (keys %libsources)
+ foreach my $iter (sort keys %libsources)
{
my $dir = '';
if ($iter =~ /^(.*)(\.[cly])$/)
@@ -3828,7 +3836,7 @@ sub handle_dist ()
$check_aux = 1;
}
}
- foreach my $cfile (@common_files)
+ foreach my $cfile (@toplevelmd_ok, @common_files)
{
if (dir_has_case_matching_file ($relative_dir, $cfile)
# The file might be absent, but if it can be built it's ok.
@@ -3836,13 +3844,30 @@ sub handle_dist ()
{
push_dist_common ($cfile);
}
+ elsif (grep { $_ eq $cfile } @toplevelmd_ok)
+ { # Irritatingly, have to repeat the checks, now for .md files;
+ # we want to prefer non-.md, so do this second, and only "elsif".
+ if (dir_has_case_matching_file ($relative_dir, "$cfile.md")
+ || rule "$cfile.md")
+ {
+ push_dist_common ("$cfile.md");
+ }
+ }
# Don't use 'elsif' here because a file might meaningfully
- # appear in both directories.
+ # appear in both $relative_dir and $config_aux_dir.
if ($check_aux && dir_has_case_matching_file ($config_aux_dir, $cfile))
{
push_dist_common ("$config_aux_dir/$cfile")
}
+ elsif ($check_aux && grep { $_ eq $cfile } @toplevelmd_ok)
+ {
+ if (dir_has_case_matching_file ($config_aux_dir, "$cfile.md")
+ || rule "$cfile.md")
+ {
+ push_dist_common ("$cfile.md");
+ }
+ }
}
# We might copy elements from @configure_dist_common to
@@ -4692,7 +4717,7 @@ sub handle_clean
DIST_CLEAN, [],
MAINTAINER_CLEAN, []);
- foreach my $file (keys %clean_files)
+ foreach my $file (sort keys %clean_files)
{
my $when = $clean_files{$file};
prog_error 'invalid entry in %clean_files'
@@ -4762,7 +4787,7 @@ sub handle_factored_dependencies ()
. "not 'install-hook'");
# Install the -local hooks.
- foreach (keys %dependencies)
+ foreach (sort keys %dependencies)
{
# Hooks are installed on the -am targets.
s/-am$// or next;
@@ -4784,7 +4809,7 @@ sub handle_factored_dependencies ()
}
# All the required targets are phony.
- depend ('.PHONY', keys %required_targets);
+ depend ('.PHONY', sort keys %required_targets);
# Actually output gathered targets.
foreach (sort target_cmp keys %dependencies)
@@ -5114,11 +5139,12 @@ sub handle_minor_options ()
"version '$package_version' doesn't follow " .
"Gnits standards");
}
- if (defined $1 && -f 'README-alpha')
+ if (defined $1 && (-f 'README-alpha' || -f 'README-alpha.md'))
{
# This means we have an alpha release. See
# GNITS_VERSION_PATTERN for details.
- push_dist_common ('README-alpha');
+ my $af = -f 'README-alpha' ? 'README-alpha' : 'README-alpha.md';
+ push_dist_common ($af);
}
}
}
@@ -5260,7 +5286,7 @@ sub scan_autoconf_traces
# has a precise meaning for AC_CONFIG_FILES and so on.
$traces .= join (' ',
map { "--trace=$_" . ':\$f:\$l::\$d::\$n::\${::}%' }
- (keys %traced));
+ (sort keys %traced));
verb "running WARNINGS=$ENV{WARNINGS} $traces";
my $tracefh = new Automake::XFile ("$traces $filename |");
@@ -5605,8 +5631,16 @@ sub check_gnu_standards ()
if ($relative_dir eq '.')
{
# In top level (or only) directory.
- require_file ("$am_file.am", GNU,
- qw/INSTALL NEWS README AUTHORS ChangeLog/);
+
+ foreach my $file (@toplevelmd_ok)
+ {
+ next if $file eq 'THANKS'; # gnits, checked below
+ # if non-.md is absent, and .md is present, require .md;
+ # otherwise require non-.md.
+ my $required
+ = (! -f $file && -f "$file.md") ? "$file.md" : $file;
+ require_file ("$am_file.am", GNU, $required);
+ }
# Accept one of these three licenses; default to COPYING.
# Make sure we do not overwrite an existing license.
@@ -5637,7 +5671,10 @@ sub check_gnits_standards ()
if ($relative_dir eq '.')
{
# In top level (or only) directory.
- require_file ("$am_file.am", GNITS, 'THANKS');
+ my $file = 'THANKS';
+ my $required
+ = (! -f $file && -f "$file.md") ? "$file.md" : $file;
+ require_file ("$am_file.am", GNITS, $file);
}
}
@@ -5733,8 +5770,14 @@ sub lang_vala_finish_target
my $built_c_file = "\$(builddir)/$c_file";
my $built_dir = dirname $built_c_file;
my $base_c_file = basename $c_file;
+ #
+ # The -newer test here is checking "C file not older than Vala
+ # file" (not "C file newer than Vala file"; see
+ # https://bugs.gnu.org/44772. The log message on the commit
+ # misleadingly says "reversed".
+ #
$output_rules .= "$built_c_file: \$(builddir)/${derived}_vala.stamp\n"
- . "\t\@if test ! -f \$@ && test \$(srcdir) != \$(builddir) && test -n \"\$\$(find -L \$(srcdir)/$c_file -prune -newer \$(srcdir)/$vala_file)\"; then cp -p \$(srcdir)/$c_file $built_c_file; fi\n"
+ . "\t\@if test ! -f \$@ && test \$(srcdir) != \$(builddir) && test -n \"\$\$(find -L \$(srcdir)/$vala_file -prune \! -newer \$(srcdir)/$c_file)\"; then cp -p \$(srcdir)/$c_file $built_c_file; fi\n"
. "\t\@if test -f \$@; then :; else rm -f \$(builddir)/${derived}_vala.stamp; fi\n"
. "\t\@if test -f \$@; then :; else \\\n"
. "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(builddir)/${derived}_vala.stamp; \\\n"
@@ -5831,7 +5874,7 @@ sub lang_vala_finish ()
{
my ($self) = @_;
- foreach my $prog (keys %known_programs)
+ foreach my $prog (sort keys %known_programs)
{
lang_vala_finish_target ($self, $prog);
}
@@ -6317,8 +6360,12 @@ sub define_per_target_linker_variable
my ($linker, $target) = @_;
# If the user wrote a custom link command, we don't define ours.
- return "${target}_LINK"
- if set_seen "${target}_LINK";
+ my $custom_link = "${target}_LINK";
+ if (set_seen ($custom_link))
+ {
+ my $verbose = $custom_link if var (verbose_var ($custom_link));
+ return ($custom_link, $verbose);
+ }
my $xlink = $linker ? $linker : 'LINK';
@@ -6820,6 +6867,7 @@ sub preprocess_file
'SHAR' => !! option 'dist-shar',
'ZIP' => !! option 'dist-zip',
'ZSTD' => !! option 'dist-zstd',
+ 'DIST_BUILT_SOURCES' => !! option 'dist-built-sources',
'INSTALL-INFO' => ! option 'no-installinfo',
'INSTALL-MAN' => ! option 'no-installman',
@@ -8145,8 +8193,11 @@ Library files:
"(always):\n";
print_autodist_files @common_files;
print "\nFiles automatically distributed if found " .
+ "(as .md if needed):\n";
+ print_autodist_files (map { "${_}[.md]" } @toplevelmd_ok);
+ print "\nFiles automatically distributed if found " .
"(under certain conditions):\n";
- print_autodist_files @common_sometimes;
+ print_autodist_files @common_sometimes, 'README-alpha[.md]';
print '
Report bugs to <@PACKAGE_BUGREPORT@>.
diff --git a/bin/local.mk b/bin/local.mk
index 5cf2efb57..845121fa8 100644
--- a/bin/local.mk
+++ b/bin/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/bootstrap b/bootstrap
index 4ed6981c6..7c4a9b701 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
# This script helps bootstrap automake, when checked out from git.
#
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
# Originally written by Pavel Roskin <proski@gnu.org> September 2002.
#
# This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@ PACKAGE=automake
datadir=.
# This should be automatically updated by the 'update-copyright'
# rule of our Makefile.
-RELEASE_YEAR=2020
+RELEASE_YEAR=2021
# Override SHELL. This is required on DJGPP so that Perl's system()
# uses bash, not COMMAND.COM which doesn't quote arguments properly.
diff --git a/configure b/configure
index f070bc85d..42b508882 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,12 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69d.4-8e54 for GNU Automake 1.16.3.
+# Generated by GNU Autoconf 2.71 for GNU Automake 1.16.4.
#
# Report bugs to <bug-automake@gnu.org>.
#
#
-# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -16,6 +17,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -24,7 +26,7 @@ then :
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -138,7 +140,8 @@ exit 255
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+ as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
NULLCMD=:
@@ -146,7 +149,7 @@ then :
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else
+else \$as_nop
case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
@@ -169,10 +172,12 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
if ( set x; as_fn_ret_success y && test x = \"\$1\" )
then :
-else
+else \$as_nop
exitcode=1; echo positional parameters were not saved.
fi
test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
@@ -182,13 +187,13 @@ test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null
then :
as_have_required=yes
-else
+else $as_nop
as_have_required=no
fi
if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
then :
-else
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
@@ -222,7 +227,7 @@ IFS=$as_save_IFS
if $as_found
then :
-else
+else $as_nop
if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
then :
@@ -290,6 +295,7 @@ as_fn_unset ()
}
as_unset=as_fn_unset
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -307,6 +313,14 @@ as_fn_exit ()
as_fn_set_status $1
exit $1
} # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_mkdir_p
# -------------
@@ -375,7 +389,7 @@ then :
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -393,13 +407,21 @@ then :
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
}
fi # as_fn_arith
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
@@ -521,6 +543,7 @@ esac
as_echo='printf %s\n'
as_echo_n='printf %s'
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -588,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Automake'
PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.16.3'
-PACKAGE_STRING='GNU Automake 1.16.3'
+PACKAGE_VERSION='1.16.4'
+PACKAGE_STRING='GNU Automake 1.16.4'
PACKAGE_BUGREPORT='bug-automake@gnu.org'
PACKAGE_URL='https://www.gnu.org/software/automake/'
@@ -649,6 +672,9 @@ scriptdir
pkgvdatadir
APIVERSION
RELEASE_YEAR
+CSCOPE
+ETAGS
+CTAGS
am__untar
am__tar
AMTAR
@@ -1307,7 +1333,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Automake 1.16.3 to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.16.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1378,7 +1404,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Automake 1.16.3:";;
+ short | recursive ) echo "Configuration of GNU Automake 1.16.4:";;
esac
cat <<\_ACEOF
@@ -1487,10 +1513,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Automake configure 1.16.3
-generated by GNU Autoconf 2.69d.4-8e54
+GNU Automake configure 1.16.4
+generated by GNU Autoconf 2.71
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1507,7 +1533,7 @@ fi
ac_fn_c_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1529,7 +1555,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -1546,7 +1572,7 @@ fi
ac_fn_cxx_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1568,7 +1594,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -1585,7 +1611,7 @@ fi
ac_fn_fc_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1607,7 +1633,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -1624,7 +1650,7 @@ fi
ac_fn_f77_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1646,7 +1672,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -1680,8 +1706,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Automake $as_me 1.16.3, which was
-generated by GNU Autoconf 2.69d.4-8e54. Invocation command line was
+It was created by GNU Automake $as_me 1.16.4, which was
+generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -1906,26 +1932,23 @@ printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_files="$CONFIG_SITE"
elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ case $ac_site_file in #(
+ */*) :
+ ;; #(
+ *) :
+ ac_site_file=./$ac_site_file ;;
+esac
+ if test -f "$ac_site_file" && test -r "$ac_site_file"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -1954,6 +1977,530 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+ Do not test the value of __STDC__, because some compilers set it to 0
+ while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not \xHH hex character constants.
+ These do not provoke an error unfortunately, instead are silently treated
+ as an "x". The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously \x00 != x always comes out true, for an
+ array size at least. It is necessary to write \x00 == 0 to get something
+ that is true only with -std. */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+ int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+ #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data[];
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str = "";
+ int number = 0;
+ float fnumber = 0;
+
+ while (*format)
+ {
+ switch (*format++)
+ {
+ case '\''s'\'': // string
+ str = va_arg (args_copy, const char *);
+ break;
+ case '\''d'\'': // int
+ number = va_arg (args_copy, int);
+ break;
+ case '\''f'\'': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+ default:
+ break;
+ }
+ }
+ va_end (args_copy);
+ va_end (args);
+
+ return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+ // Check bool.
+ _Bool success = false;
+ success |= (argc != 0);
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->data[i] = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_array[ni.number];
+ dynamic_array[0] = argv[0][0];
+ dynamic_array[ni.number - 1] = 543;
+
+ // work around unused variable warnings
+ ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+ || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+ int_alignment = _Alignof (int),
+ int_array_alignment = _Alignof (int[100]),
+ char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+ int x;
+ _Static_assert (sizeof (int) <= sizeof (long int),
+ "_Static_assert does not work in struct");
+ long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+ union {
+ struct { int i; int j; };
+ struct { int k; long int l; } w;
+ };
+ int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+ _Static_assert ((offsetof (struct anonymous, i)
+ == offsetof (struct anonymous, w.k)),
+ "Anonymous union alignment botch");
+ v1.i = 2;
+ v1.w.k = 5;
+ ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ ${ac_c_conftest_c11_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ return ok;
+}
+"
+
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+ extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+ try {
+ throw "test";
+ } catch (const char *s) {
+ // Extra parentheses suppress a warning when building autoconf itself,
+ // due to lint rules shared with more typical C programs.
+ assert (!(strcmp) (s, "test"));
+ }
+}
+
+template <typename T> struct test_template
+{
+ T const val;
+ explicit test_template(T t) : val(t) {}
+ template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+ assert (argc);
+ assert (! argv[0]);
+{
+ test_exception_syntax ();
+ test_template<double> tt (2.0);
+ assert (tt.add (4) == 6.0);
+ assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+ constexpr int get_val() { return 20; }
+
+ struct testinit
+ {
+ int i;
+ double d;
+ };
+
+ class delegate
+ {
+ public:
+ delegate(int n) : n(n) {}
+ delegate(): delegate(2354) {}
+
+ virtual int getval() { return this->n; };
+ protected:
+ int n;
+ };
+
+ class overridden : public delegate
+ {
+ public:
+ overridden(int n): delegate(n) {}
+ virtual int getval() override final { return this->n * 2; }
+ };
+
+ class nocopy
+ {
+ public:
+ nocopy(int i): i(i) {}
+ nocopy() = default;
+ nocopy(const nocopy&) = delete;
+ nocopy & operator=(const nocopy&) = delete;
+ private:
+ int i;
+ };
+
+ // for testing lambda expressions
+ template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+ {
+ return f(v);
+ }
+
+ // for testing variadic templates and trailing return types
+ template <typename V> auto sum(V first) -> V
+ {
+ return first;
+ }
+ template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+ {
+ return first + sum(rest...);
+ }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+ // Test auto and decltype
+ auto a1 = 6538;
+ auto a2 = 48573953.4;
+ auto a3 = "String literal";
+
+ int total = 0;
+ for (auto i = a3; *i; ++i) { total += *i; }
+
+ decltype(a2) a4 = 34895.034;
+}
+{
+ // Test constexpr
+ short sa[cxx11test::get_val()] = { 0 };
+}
+{
+ // Test initializer lists
+ cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+ // Test range-based for
+ int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+ 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+ for (auto &x : array) { x += 23; }
+}
+{
+ // Test lambda expressions
+ using cxx11test::eval;
+ assert (eval ([](int x) { return x*2; }, 21) == 42);
+ double d = 2.0;
+ assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
+ assert (d == 5.0);
+ assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
+ assert (d == 5.0);
+}
+{
+ // Test use of variadic templates
+ using cxx11test::sum;
+ auto a = sum(1);
+ auto b = sum(1, 2);
+ auto c = sum(1.0, 2.0, 3.0);
+}
+{
+ // Test constructor delegation
+ cxx11test::delegate d1;
+ cxx11test::delegate d2();
+ cxx11test::delegate d3(45);
+}
+{
+ // Test override and final
+ cxx11test::overridden o1(55464);
+}
+{
+ // Test nullptr
+ char *c = nullptr;
+}
+{
+ // Test template brackets
+ test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+ // Unicode literals
+ char const *utf8 = u8"UTF-8 string \u2500";
+ char16_t const *utf16 = u"UTF-8 string \u2500";
+ char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_cxx_conftest_cxx98_main}
+ ${ac_cxx_conftest_cxx11_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_cxx_conftest_cxx98_main}
+ return ok;
+}
+"
+
# Auxiliary files required by this configure script.
ac_aux_files="compile missing install-sh config.guess config.sub"
@@ -2033,7 +2580,7 @@ IFS=$as_save_IFS
if $as_found
then :
-else
+else $as_nop
as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
fi
@@ -2142,7 +2689,7 @@ printf %s "checking whether $am_make supports nested variables... " >&6; }
if test ${am_cv_make_support_nested_variables+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if printf "%s\n" 'TRUE=$(BAR$(V))
BAR0=false
BAR1=true
@@ -2179,7 +2726,7 @@ printf %s "checking build system type... " >&6; }
if test ${ac_cv_build+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
@@ -2214,7 +2761,7 @@ printf %s "checking host system type... " >&6; }
if test ${ac_cv_host+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
@@ -2283,7 +2830,7 @@ if test -z "$INSTALL"; then
if test ${ac_cv_path_install+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
@@ -2477,7 +3024,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_STRIP+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
@@ -2522,7 +3069,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_STRIP+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
@@ -2581,7 +3128,7 @@ if test -z "$MKDIR_P"; then
if test ${ac_cv_path_mkdir+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
@@ -2631,7 +3178,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_AWK+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
@@ -2676,7 +3223,7 @@ ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if eval test \${ac_cv_prog_make_${ac_make}_set+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@@ -2732,7 +3279,7 @@ fi
# Define the identity of the package.
PACKAGE='automake'
- VERSION='1.16.3'
+ VERSION='1.16.4'
# Some tools Automake needs.
@@ -2773,6 +3320,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+
+
# POSIX will say in a future version that running "rm -f" with no argument
# is OK; and we want to be able to make that assumption in our Makefile
@@ -2819,7 +3380,7 @@ fi
# Keep this on a line of its own, since it must be found and processed
# by the 'update-copyright' rule in our Makefile.
-RELEASE_YEAR=2020
+RELEASE_YEAR=2021
# The API version is the base version. We must guarantee
@@ -2864,7 +3425,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_PERL+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
case $PERL in
[\\/]* | ?:[\\/]*)
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
@@ -2926,7 +3487,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_TEX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$TEX"; then
ac_cv_prog_TEX="$TEX" # Let the user override the test.
else
@@ -2990,7 +3551,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_YACC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
else
@@ -3038,7 +3599,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_LEX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
else
@@ -3091,7 +3652,7 @@ printf %s "checking whether autoconf is installed... " >&6; }
if test ${am_cv_autoconf_installed+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if { echo "$as_me:$LINENO: $am_AUTOCONF --version" >&5
($am_AUTOCONF --version) >&5 2>&5
ac_status=$?
@@ -3115,9 +3676,11 @@ printf %s "checking whether autoconf works... " >&6; }
if test ${am_cv_autoconf_works+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
mkdir conftest
-echo 'AC''_INIT' > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC''_INIT(smoke-test, 1)' \
+ 'AC''_OUTPUT'
if { echo "$as_me:$LINENO: cd conftest && $am_AUTOCONF -o /dev/null conftest.ac" >&5
(cd conftest && $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5
ac_status=$?
@@ -3142,9 +3705,12 @@ printf %s "checking whether autoconf is recent enough... " >&6; }
if test ${am_cv_autoconf_version+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
mkdir conftest
-echo 'AC'"_PREREQ([$required_autoconf_version])" > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC'"_PREREQ([$required_autoconf_version])" \
+ 'AC''_INIT(smoke-test, 1)' \
+ 'AC''_OUTPUT'
if { echo "$as_me:$LINENO: cd conftest && $am_AUTOCONF -o /dev/null conftest.ac" >&5
(cd conftest && $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5
ac_status=$?
@@ -3169,7 +3735,7 @@ printf %s "checking whether ln works... " >&6; }
if test ${am_cv_prog_ln+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
rm -f conftest conftest.file
: >conftest.file
@@ -3208,7 +3774,7 @@ printf %s "checking for grep that handles long lines and -e... " >&6; }
if test ${ac_cv_path_GREP+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -z "$GREP"; then
ac_path_GREP_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
@@ -3277,7 +3843,7 @@ printf %s "checking for egrep... " >&6; }
if test ${ac_cv_path_EGREP+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
@@ -3350,7 +3916,7 @@ printf %s "checking for fgrep... " >&6; }
if test ${ac_cv_path_FGREP+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
then ac_cv_path_FGREP="$GREP -F"
else
@@ -3461,6 +4027,7 @@ printf "%s\n" "$as_me: will now look for a sturdy POSIX shell, for our testsuite
am_bourne_compatible="# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -3469,7 +4036,7 @@ then :
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else
+else \$as_nop
case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
@@ -3482,7 +4049,7 @@ fi
if test ${ac_cv_AM_TEST_RUNNER_SHELL+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test "$AM_TEST_RUNNER_SHELL"; then
# Let the user override it.
ac_cv_AM_TEST_RUNNER_SHELL=$AM_TEST_RUNNER_SHELL
@@ -3499,7 +4066,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_am_candidate_sh+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
case $am_candidate_sh in
[\\/]* | ?:[\\/]*)
ac_cv_path_am_candidate_sh="$am_candidate_sh" # Let the user override the test with a path.
@@ -3817,7 +4384,21 @@ fi
printf "%s\n" "$as_me: will now look for generic compilers" >&6;}
# C compiler.
-ac_ext=c
+
+
+
+
+
+
+
+
+
+
+
+
+ am__failed=no
+ while :; do
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3832,7 +4413,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
@@ -3881,7 +4462,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
@@ -4042,7 +4623,7 @@ do
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else
+else $as_nop
ac_file=''
fi
if test -z "$ac_file"
@@ -4058,7 +4639,7 @@ printf "%s\n" "$as_me: WARNING: C compiler cannot create executables" >&2;}
am__failed=yes
break
}
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
fi
@@ -4097,7 +4678,7 @@ for ac_file in conftest.exe conftest conftest.*; do
* ) break;;
esac
done
-else
+else $as_nop
{
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5
printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;}
@@ -4179,7 +4760,7 @@ printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4212,7 +4793,7 @@ then :
break;;
esac
done
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4234,7 +4815,7 @@ printf %s "checking whether the compiler supports GNU C... " >&6; }
if test ${ac_cv_c_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4252,10 +4833,10 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else
+else $as_nop
ac_compiler_gnu=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -4275,7 +4856,7 @@ printf %s "checking whether $CC accepts -g... " >&6; }
if test ${ac_cv_prog_cc_g+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
@@ -4294,7 +4875,7 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_g=yes
-else
+else $as_nop
CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4310,7 +4891,7 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
-else
+else $as_nop
ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4328,11 +4909,11 @@ if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
@@ -4352,206 +4933,20 @@ else
CFLAGS=
fi
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
printf %s "checking for $CC option to enable C11 features... " >&6; }
if test ${ac_cv_prog_cc_c11+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_cv_prog_cc_c11=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-// Check varargs macros. These examples are taken from C99 6.10.3.5.
-#define debug(...) fprintf (stderr, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
- int x = 1234;
- int y = 5678;
- debug ("Flag");
- debug ("X = %d\n", x);
- showlist (The first, second, and third items.);
- report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
- your preprocessor is broken;
-#endif
-#if BIG_OK
-#else
- your preprocessor is broken;
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
- int datasize;
- double data[];
-};
-
-struct named_init {
- int number;
- const wchar_t *name;
- double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
- // See if C++-style comments work.
- // Iterate through items via the restricted pointer.
- // Also check for declarations in for loops.
- for (unsigned int i = 0; *(text+i) != '\0'; ++i)
- continue;
- return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
- va_list args;
- va_start (args, format);
- va_list args_copy;
- va_copy (args_copy, args);
-
- const char *str = "";
- int number = 0;
- float fnumber = 0;
-
- while (*format)
- {
- switch (*format++)
- {
- case 's': // string
- str = va_arg (args_copy, const char *);
- break;
- case 'd': // int
- number = va_arg (args_copy, int);
- break;
- case 'f': // float
- fnumber = va_arg (args_copy, double);
- break;
- default:
- break;
- }
- }
- va_end (args_copy);
- va_end (args);
-
- return *str && number && fnumber;
-}
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
- int_alignment = _Alignof (int),
- int_array_alignment = _Alignof (int[100]),
- char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
- int x;
- _Static_assert (sizeof (int) <= sizeof (long int),
- "_Static_assert does not work in struct");
- long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal[] = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
- union {
- struct { int i; int j; };
- struct { int k; long int l; } w;
- };
- int m;
-} v1;
-
-int
-main (void)
-{
-
- // Check bool.
- _Bool success = false;
-
- // Check restrict.
- if (test_restrict ("String literal") == 0)
- success = true;
- char *restrict newvar = "Another string";
-
- // Check varargs.
- success &= test_varargs ("s, d' f .", "string", 65, 34.234);
- test_varargs_macros ();
-
- // Check flexible array members.
- struct incomplete_array *ia =
- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
- ia->datasize = 10;
- for (int i = 0; i < ia->datasize; ++i)
- ia->data[i] = i * 1.234;
-
- // Check named initializers.
- struct named_init ni = {
- .number = 34,
- .name = L"Test wide string",
- .average = 543.34343,
- };
-
- ni.number = 58;
-
- int dynamic_array[ni.number];
- dynamic_array[ni.number - 1] = 543;
-
- // work around unused variable warnings
- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
- || dynamic_array[ni.number - 1] != 543);
-
- v1.i = 2;
- v1.w.k = 5;
- _Static_assert ((offsetof (struct anonymous, i)
- == offsetof (struct anonymous, w.k)),
- "Anonymous union alignment botch");
-
- ;
- return 0;
-}
+$ac_c_conftest_c11_program
_ACEOF
for ac_arg in '' -std=gnu11
do
@@ -4560,317 +4955,122 @@ do
then :
ac_cv_prog_cc_c11=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
test "x$ac_cv_prog_cc_c11" != "xno" && break
done
rm -f conftest.$ac_ext
CC=$ac_save_CC
-
fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c11" in
- x)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;;
- xno)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;;
- *)
- ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11"
- CC=$CC$ac_prog_cc_stdc_options
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c11" != xno
+
+if test "x$ac_cv_prog_cc_c11" = xno
then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c11" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+ CC="$CC $ac_cv_prog_cc_c11"
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
ac_prog_cc_stdc=c11
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-else
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
printf %s "checking for $CC option to enable C99 features... " >&6; }
if test ${ac_cv_prog_cc_c99+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_cv_prog_cc_c99=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-// Check varargs macros. These examples are taken from C99 6.10.3.5.
-#define debug(...) fprintf (stderr, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
- int x = 1234;
- int y = 5678;
- debug ("Flag");
- debug ("X = %d\n", x);
- showlist (The first, second, and third items.);
- report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
- your preprocessor is broken;
-#endif
-#if BIG_OK
-#else
- your preprocessor is broken;
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
- int datasize;
- double data[];
-};
-
-struct named_init {
- int number;
- const wchar_t *name;
- double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
- // See if C++-style comments work.
- // Iterate through items via the restricted pointer.
- // Also check for declarations in for loops.
- for (unsigned int i = 0; *(text+i) != '\0'; ++i)
- continue;
- return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
- va_list args;
- va_start (args, format);
- va_list args_copy;
- va_copy (args_copy, args);
-
- const char *str = "";
- int number = 0;
- float fnumber = 0;
-
- while (*format)
- {
- switch (*format++)
- {
- case 's': // string
- str = va_arg (args_copy, const char *);
- break;
- case 'd': // int
- number = va_arg (args_copy, int);
- break;
- case 'f': // float
- fnumber = va_arg (args_copy, double);
- break;
- default:
- break;
- }
- }
- va_end (args_copy);
- va_end (args);
-
- return *str && number && fnumber;
-}
-int
-main (void)
-{
-
- // Check bool.
- _Bool success = false;
-
- // Check restrict.
- if (test_restrict ("String literal") == 0)
- success = true;
- char *restrict newvar = "Another string";
-
- // Check varargs.
- success &= test_varargs ("s, d' f .", "string", 65, 34.234);
- test_varargs_macros ();
-
- // Check flexible array members.
- struct incomplete_array *ia =
- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
- ia->datasize = 10;
- for (int i = 0; i < ia->datasize; ++i)
- ia->data[i] = i * 1.234;
-
- // Check named initializers.
- struct named_init ni = {
- .number = 34,
- .name = L"Test wide string",
- .average = 543.34343,
- };
-
- ni.number = 58;
-
- int dynamic_array[ni.number];
- dynamic_array[ni.number - 1] = 543;
-
- // work around unused variable warnings
- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
- || dynamic_array[ni.number - 1] != 543);
-
- ;
- return 0;
-}
+$ac_c_conftest_c99_program
_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
do
CC="$ac_save_CC $ac_arg"
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_c99=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
rm -f conftest.$ac_ext
CC=$ac_save_CC
-
fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c99" in
- x)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;;
- xno)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;;
- *)
- ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99"
- CC=$CC$ac_prog_cc_stdc_options
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno
+
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c99" = x
then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+ CC="$CC $ac_cv_prog_cc_c99"
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
ac_prog_cc_stdc=c99
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-else
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
printf %s "checking for $CC option to enable C89 features... " >&6; }
if test ${ac_cv_prog_cc_c89+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main (void)
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
+$ac_c_conftest_c89_program
_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_c89=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
CC=$ac_save_CC
-
fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c89" in
- x)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;;
- xno)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;;
- *)
- ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89"
- CC=$CC$ac_prog_cc_stdc_options
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno
+
+if test "x$ac_cv_prog_cc_c89" = xno
then :
- ac_prog_cc_stdc=c89
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-else
- ac_prog_cc_stdc=no
- ac_cv_prog_cc_stdc=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c89" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+ CC="$CC $ac_cv_prog_cc_c89"
fi
-
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+ ac_prog_cc_stdc=c89
fi
-
fi
ac_ext=c
@@ -4880,12 +5080,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- am__failed=no
- while :; do
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4896,7 +5090,7 @@ printf %s "checking whether $CC understands -c and -o together... " >&6; }
if test ${am_cv_prog_cc_c_o+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4969,7 +5163,7 @@ fi
if test x"$GCC" = x"yes"
then :
am_CC_is_GNU=yes
-else
+else $as_nop
am_CC_is_GNU=no
fi
@@ -4993,6 +5187,12 @@ fi
+
+
+
+
+
+
am__failed=no
while :; do
ac_ext=cpp
@@ -5014,7 +5214,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_CXX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
@@ -5063,7 +5263,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_CXX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
else
@@ -5218,7 +5418,7 @@ do
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else
+else $as_nop
ac_file=''
fi
if test -z "$ac_file"
@@ -5234,7 +5434,7 @@ printf "%s\n" "$as_me: WARNING: C++ compiler cannot create executables" >&2;}
am__failed=yes
break
}
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
fi
@@ -5273,7 +5473,7 @@ for ac_file in conftest.exe conftest conftest.*; do
* ) break;;
esac
done
-else
+else $as_nop
{
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5
printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;}
@@ -5355,7 +5555,7 @@ printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5388,7 +5588,7 @@ then :
break;;
esac
done
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5410,7 +5610,7 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; }
if test ${ac_cv_cxx_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5428,10 +5628,10 @@ _ACEOF
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else
+else $as_nop
ac_compiler_gnu=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -5451,7 +5651,7 @@ printf %s "checking whether $CXX accepts -g... " >&6; }
if test ${ac_cv_prog_cxx_g+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
@@ -5470,7 +5670,7 @@ _ACEOF
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_cv_prog_cxx_g=yes
-else
+else $as_nop
CXXFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5486,7 +5686,7 @@ _ACEOF
if ac_fn_cxx_try_compile "$LINENO"
then :
-else
+else $as_nop
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5504,11 +5704,11 @@ if ac_fn_cxx_try_compile "$LINENO"
then :
ac_cv_prog_cxx_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
@@ -5528,313 +5728,66 @@ else
CXXFLAGS=
fi
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
-else
- ac_cv_prog_cxx_cxx11=no
+else $as_nop
+ ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
- constexpr int get_val() { return 20; }
-
- struct testinit
- {
- int i;
- double d;
- };
-
- class delegate
- {
- public:
- delegate(int n) : n(n) {}
- delegate(): delegate(2354) {}
-
- virtual int getval() { return this->n; };
- protected:
- int n;
- };
-
- class overridden : public delegate
- {
- public:
- overridden(int n): delegate(n) {}
- virtual int getval() override final { return this->n * 2; }
- };
-
- class nocopy
- {
- public:
- nocopy(int i): i(i) {}
- nocopy() = default;
- nocopy(const nocopy&) = delete;
- nocopy & operator=(const nocopy&) = delete;
- private:
- int i;
- };
-
- // for testing lambda expressions
- template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
- {
- return f(v);
- }
-
- // for testing variadic templates and trailing return types
- template <typename V> auto sum(V first) -> V
- {
- return first;
- }
- template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
- {
- return first + sum(rest...);
- }
-}
-
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are cheap compared to including any STL header, but will
-// reliably reject old compilers that lack the unsuffixed header files.
-#undef NDEBUG
-#include <cassert>
-#include <cstring>
-#include <iostream>
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::cout;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
- try {
- throw "test";
- } catch (const char *s) {
- // Extra parentheses suppress a warning when building autoconf itself,
- // due to lint rules shared with more typical C programs.
- assert (!(strcmp) (s, "test"));
- }
-}
-
-template <typename T> struct test_template
-{
- T const val;
- explicit test_template(T t) : val(t) {}
- template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-
-int
-main (void)
-{
-
-{
- // Test auto and decltype
- auto a1 = 6538;
- auto a2 = 48573953.4;
- auto a3 = "String literal";
-
- int total = 0;
- for (auto i = a3; *i; ++i) { total += *i; }
-
- decltype(a2) a4 = 34895.034;
-}
-{
- // Test constexpr
- short sa[cxx11test::get_val()] = { 0 };
-}
-{
- // Test initializer lists
- cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
- // Test range-based for
- int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
- 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
- for (auto &x : array) { x += 23; }
-}
-{
- // Test lambda expressions
- using cxx11test::eval;
- assert (eval ([](int x) { return x*2; }, 21) == 42);
- double d = 2.0;
- assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
- assert (d == 5.0);
- assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
- assert (d == 5.0);
-}
-{
- // Test use of variadic templates
- using cxx11test::sum;
- auto a = sum(1);
- auto b = sum(1, 2);
- auto c = sum(1.0, 2.0, 3.0);
-}
-{
- // Test constructor delegation
- cxx11test::delegate d1;
- cxx11test::delegate d2();
- cxx11test::delegate d3(45);
-}
-{
- // Test override and final
- cxx11test::overridden o1(55464);
-}
-{
- // Test nullptr
- char *c = nullptr;
-}
-{
- // Test template brackets
- test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
- // Unicode literals
- char const *utf8 = u8"UTF-8 string \u2500";
- char16_t const *utf16 = u"UTF-8 string \u2500";
- char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-
-
-{
- test_exception_syntax ();
- test_template<double> tt (2.0);
- assert (tt.add (4) == 6.0);
- assert (true && !false);
- cout << "ok\n";
-}
-
- ;
- return 0;
-}
+$ac_cxx_conftest_cxx11_program
_ACEOF
-for ac_arg in '' -std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
do
CXX="$ac_save_CXX $ac_arg"
if ac_fn_cxx_try_compile "$LINENO"
then :
ac_cv_prog_cxx_cxx11=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
done
rm -f conftest.$ac_ext
CXX=$ac_save_CXX
-
fi
-# AC_CACHE_VAL
-ac_prog_cxx_stdcxx_options=
-case "x$ac_cv_prog_cxx_cxx11" in
- x)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;;
- xno)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;;
- *)
- ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx11"
- CXX=$CXX$ac_prog_cxx_stdcxx_options
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } ;;
-esac
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "x$ac_cv_prog_cxx_cxx11" != xno
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+ CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
ac_prog_cxx_stdcxx=cxx11
- ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
- ac_cv_prog_cxx_cxx98=$ac_cv_prog_cxx_cxx11
-else
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
-else
- ac_cv_prog_cxx_cxx98=no
+else $as_nop
+ ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are cheap compared to including any STL header, but will
-// reliably reject old compilers that lack the unsuffixed header files.
-#undef NDEBUG
-#include <cassert>
-#include <cstring>
-#include <iostream>
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::cout;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
- try {
- throw "test";
- } catch (const char *s) {
- // Extra parentheses suppress a warning when building autoconf itself,
- // due to lint rules shared with more typical C programs.
- assert (!(strcmp) (s, "test"));
- }
-}
-
-template <typename T> struct test_template
-{
- T const val;
- explicit test_template(T t) : val(t) {}
- template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-
-int
-main (void)
-{
-
-{
- test_exception_syntax ();
- test_template<double> tt (2.0);
- assert (tt.add (4) == 6.0);
- assert (true && !false);
- cout << "ok\n";
-}
-
- ;
- return 0;
-}
+$ac_cxx_conftest_cxx98_program
_ACEOF
for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
do
@@ -5843,42 +5796,30 @@ do
then :
ac_cv_prog_cxx_cxx98=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
done
rm -f conftest.$ac_ext
CXX=$ac_save_CXX
-
fi
-# AC_CACHE_VAL
-ac_prog_cxx_stdcxx_options=
-case "x$ac_cv_prog_cxx_cxx98" in
- x)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;;
- xno)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;;
- *)
- ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx98"
- CXX=$CXX$ac_prog_cxx_stdcxx_options
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } ;;
-esac
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "x$ac_cv_prog_cxx_cxx98" != xno
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cxx_cxx98" = x
then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+ CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
ac_prog_cxx_stdcxx=cxx98
- ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-else
- ac_prog_cxx_stdcxx=no
- ac_cv_prog_cxx_stdcxx=no
fi
-
fi
ac_ext=c
@@ -5910,7 +5851,7 @@ fi
if test x"$GXX" = x"yes"
then :
am_CXX_is_GNU=yes
-else
+else $as_nop
am_CXX_is_GNU=no
fi
@@ -5938,7 +5879,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_FC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$FC"; then
ac_cv_prog_FC="$FC" # Let the user override the test.
else
@@ -5987,7 +5928,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_FC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_FC"; then
ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
else
@@ -6136,7 +6077,7 @@ do
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else
+else $as_nop
ac_file=''
fi
if test -z "$ac_file"
@@ -6152,7 +6093,7 @@ printf "%s\n" "$as_me: WARNING: Fortran compiler cannot create executables" >&2;
am__failed=yes
break
}
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
fi
@@ -6191,7 +6132,7 @@ for ac_file in conftest.exe conftest conftest.*; do
* ) break;;
esac
done
-else
+else $as_nop
{
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5
printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;}
@@ -6267,7 +6208,7 @@ printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat > conftest.$ac_ext <<_ACEOF
program main
@@ -6294,7 +6235,7 @@ then :
break;;
esac
done
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6320,7 +6261,7 @@ printf %s "checking whether the compiler supports GNU Fortran... " >&6; }
if test ${ac_cv_fc_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat > conftest.$ac_ext <<_ACEOF
program main
#ifndef __GNUC__
@@ -6332,10 +6273,10 @@ _ACEOF
if ac_fn_fc_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else
+else $as_nop
ac_compiler_gnu=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_fc_compiler_gnu=$ac_compiler_gnu
fi
@@ -6352,7 +6293,7 @@ printf %s "checking whether $FC accepts -g... " >&6; }
if test ${ac_cv_prog_fc_g+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
FCFLAGS=-g
cat > conftest.$ac_ext <<_ACEOF
program main
@@ -6362,10 +6303,10 @@ _ACEOF
if ac_fn_fc_try_compile "$LINENO"
then :
ac_cv_prog_fc_g=yes
-else
+else $as_nop
ac_cv_prog_fc_g=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5
@@ -6420,7 +6361,7 @@ fi
if test x"$GFC" = x"yes"
then :
am_FC_is_GNU=yes
-else
+else $as_nop
am_FC_is_GNU=no
fi
@@ -6443,7 +6384,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_F77+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$F77"; then
ac_cv_prog_F77="$F77" # Let the user override the test.
else
@@ -6492,7 +6433,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_F77+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_F77"; then
ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
else
@@ -6641,7 +6582,7 @@ do
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else
+else $as_nop
ac_file=''
fi
if test -z "$ac_file"
@@ -6657,7 +6598,7 @@ printf "%s\n" "$as_me: WARNING: Fortran 77 compiler cannot create executables" >
am__failed=yes
break
}
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
fi
@@ -6696,7 +6637,7 @@ for ac_file in conftest.exe conftest conftest.*; do
* ) break;;
esac
done
-else
+else $as_nop
{
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5
printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;}
@@ -6772,7 +6713,7 @@ printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat > conftest.$ac_ext <<_ACEOF
program main
@@ -6799,7 +6740,7 @@ then :
break;;
esac
done
-else
+else $as_nop
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6825,7 +6766,7 @@ printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; }
if test ${ac_cv_f77_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
cat > conftest.$ac_ext <<_ACEOF
program main
#ifndef __GNUC__
@@ -6837,10 +6778,10 @@ _ACEOF
if ac_fn_f77_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else
+else $as_nop
ac_compiler_gnu=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
@@ -6857,7 +6798,7 @@ printf %s "checking whether $F77 accepts -g... " >&6; }
if test ${ac_cv_prog_f77_g+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
FFLAGS=-g
cat > conftest.$ac_ext <<_ACEOF
program main
@@ -6867,10 +6808,10 @@ _ACEOF
if ac_fn_f77_try_compile "$LINENO"
then :
ac_cv_prog_f77_g=yes
-else
+else $as_nop
ac_cv_prog_f77_g=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
@@ -6925,7 +6866,7 @@ fi
if test x"$G77" = x"yes"
then :
am_F77_is_GNU=yes
-else
+else $as_nop
am_F77_is_GNU=no
fi
@@ -6960,7 +6901,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_GNU_CC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$GNU_CC"; then
ac_cv_prog_GNU_CC="$GNU_CC" # Let the user override the test.
else
@@ -7009,7 +6950,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_GNU_CC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_GNU_CC"; then
ac_cv_prog_ac_ct_GNU_CC="$ac_ct_GNU_CC" # Let the user override the test.
else
@@ -7069,7 +7010,7 @@ if test "$GNU_CC" != false; then
(exit $ac_status); }
then :
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C compiler" >&5
printf "%s\n" "$as_me: WARNING: botched installation for GNU C compiler" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C compiler will be skipped" >&5
@@ -7096,7 +7037,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_GNU_CXX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$GNU_CXX"; then
ac_cv_prog_GNU_CXX="$GNU_CXX" # Let the user override the test.
else
@@ -7145,7 +7086,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_GNU_CXX+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_GNU_CXX"; then
ac_cv_prog_ac_ct_GNU_CXX="$ac_ct_GNU_CXX" # Let the user override the test.
else
@@ -7205,7 +7146,7 @@ if test "$GNU_CXX" != false; then
(exit $ac_status); }
then :
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C++ compiler" >&5
printf "%s\n" "$as_me: WARNING: botched installation for GNU C++ compiler" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C++ compiler will be skipped" >&5
@@ -7232,7 +7173,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_GNU_FC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$GNU_FC"; then
ac_cv_prog_GNU_FC="$GNU_FC" # Let the user override the test.
else
@@ -7281,7 +7222,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_GNU_FC+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_GNU_FC"; then
ac_cv_prog_ac_ct_GNU_FC="$ac_ct_GNU_FC" # Let the user override the test.
else
@@ -7341,7 +7282,7 @@ if test "$GNU_FC" != false; then
(exit $ac_status); }
then :
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran compiler" >&5
printf "%s\n" "$as_me: WARNING: botched installation for GNU Fortran compiler" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran compiler will be skipped" >&5
@@ -7368,7 +7309,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_GNU_F77+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$GNU_F77"; then
ac_cv_prog_GNU_F77="$GNU_F77" # Let the user override the test.
else
@@ -7417,7 +7358,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_GNU_F77+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_GNU_F77"; then
ac_cv_prog_ac_ct_GNU_F77="$ac_ct_GNU_F77" # Let the user override the test.
else
@@ -7477,7 +7418,7 @@ if test "$GNU_F77" != false; then
(exit $ac_status); }
then :
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran 77 compiler" >&5
printf "%s\n" "$as_me: WARNING: botched installation for GNU Fortran 77 compiler" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran 77 compiler will be skipped" >&5
@@ -7498,7 +7439,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_GNU_GCJ+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$GNU_GCJ"; then
ac_cv_prog_GNU_GCJ="$GNU_GCJ" # Let the user override the test.
else
@@ -7547,7 +7488,7 @@ printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_ac_ct_GNU_GCJ+y}
then :
printf %s "(cached) " >&6
-else
+else $as_nop
if test -n "$ac_ct_GNU_GCJ"; then
ac_cv_prog_ac_ct_GNU_GCJ="$ac_ct_GNU_GCJ" # Let the user override the test.
else
@@ -7606,7 +7547,7 @@ if test "$GNU_GCJ" != false; then
(exit $ac_status); }
then :
-else
+else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Java compiler" >&5
printf "%s\n" "$as_me: WARNING: botched installation for GNU Java compiler" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Java compiler will be skipped" >&5
@@ -7823,6 +7764,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -7831,7 +7773,7 @@ then :
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -7937,6 +7879,7 @@ as_fn_error ()
} # as_fn_error
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -7963,6 +7906,7 @@ as_fn_unset ()
{ eval $1=; unset $1;}
}
as_unset=as_fn_unset
+
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -7975,7 +7919,7 @@ then :
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -7993,7 +7937,7 @@ then :
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
@@ -8181,8 +8125,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Automake $as_me 1.16.3, which was
-generated by GNU Autoconf 2.69d.4-8e54. Invocation command line was
+This file was extended by GNU Automake $as_me 1.16.4, which was
+generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -8242,11 +8186,11 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-GNU Automake config.status 1.16.3
-configured by $0, generated by GNU Autoconf 2.69d.4-8e54,
+GNU Automake config.status 1.16.4
+configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
diff --git a/configure.ac b/configure.ac
index 15d3f8e60..f7656ffea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 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
@@ -16,7 +16,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.16.3], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.16.4], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([bin/automake.in])
AC_CONFIG_AUX_DIR([lib])
@@ -44,7 +44,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99
# Keep this on a line of its own, since it must be found and processed
# by the 'update-copyright' rule in our Makefile.
-RELEASE_YEAR=2020
+RELEASE_YEAR=2021
AC_SUBST([RELEASE_YEAR])
# The API version is the base version. We must guarantee
@@ -123,7 +123,9 @@ fi
AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
[mkdir conftest
-echo 'AC''_INIT' > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_works=yes
@@ -139,7 +141,10 @@ fi
AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
[mkdir conftest
dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
-echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC'"_PREREQ([[$required_autoconf_version]])" \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_version=yes
diff --git a/contrib/check-html.am b/contrib/check-html.am
index fc593eea3..42dce1619 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in
index 5405eea83..06d5b9f0b 100644
--- a/contrib/multilib/config-ml.in
+++ b/contrib/multilib/config-ml.in
@@ -1,7 +1,7 @@
# Configure fragment invoked in the post-target section for subdirs
# wanting multilib support.
#
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/multilib/multi.m4 b/contrib/multilib/multi.m4
index 656d0c6e0..9f5d32523 100644
--- a/contrib/multilib/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/contrib/multilib/multilib.am b/contrib/multilib/multilib.am
index 63edb9e7b..014dd7714 100644
--- a/contrib/multilib/multilib.am
+++ b/contrib/multilib/multilib.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 Free Software Foundation, Inc.
## This Makefile.in is free software; the Free Software Foundation
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
diff --git a/contrib/multilib/symlink-tree b/contrib/multilib/symlink-tree
index 1b230b6ce..c67dd7ac7 100755
--- a/contrib/multilib/symlink-tree
+++ b/contrib/multilib/symlink-tree
@@ -1,7 +1,7 @@
#!/bin/sh
# Create a symlink tree.
#
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/t/help-multilib.sh b/contrib/t/help-multilib.sh
index eb27e22bb..4eced0d46 100755
--- a/contrib/t/help-multilib.sh
+++ b/contrib/t/help-multilib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/contrib/t/local.mk b/contrib/t/local.mk
index 712755521..ad9eb2e4a 100644
--- a/contrib/t/local.mk
+++ b/contrib/t/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/contrib/t/multilib.sh b/contrib/t/multilib.sh
index 4b767d7f6..8397fdbfd 100755
--- a/contrib/t/multilib.sh
+++ b/contrib/t/multilib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -61,6 +61,11 @@ check-all:
test -f debug/libbar/libbar.a
test -f libfoo/libfoo.a
test -f libbar/libbar.a
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# make[5]: *** No rule to make target 'mostlyclean'. Stop.
+# make[5]: Leaving directory '/u/karl/gnu/src/akarl/contrib/t/multilib.dir/build/debug/libbar/sub'
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
EOF
# libfoo tests multilib supports when there are no subdirectories
@@ -89,6 +94,10 @@ cat >libfoo/Makefile.am <<'END'
noinst_LIBRARIES = libfoo.a
libfoo_a_SOURCES = foo.c
include $(top_srcdir)/multilib.am
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
: > libfoo/foo.c
@@ -116,6 +125,10 @@ SUBDIRS = sub
noinst_LIBRARIES = libbar.a
libbar_a_SOURCES = bar.c
include $(top_srcdir)/multilib.am
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
mkdir libbar/sub
diff --git a/contrib/t/parallel-tests-html-recursive.sh b/contrib/t/parallel-tests-html-recursive.sh
index 79322521e..185e546e1 100755
--- a/contrib/t/parallel-tests-html-recursive.sh
+++ b/contrib/t/parallel-tests-html-recursive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh
index 1554dead0..14ee854fa 100755
--- a/contrib/t/parallel-tests-html.sh
+++ b/contrib/t/parallel-tests-html.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/contrib/tap-driver.pl b/contrib/tap-driver.pl
index a133fa16a..dcc71ed40 100755
--- a/contrib/tap-driver.pl
+++ b/contrib/tap-driver.pl
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/doc/amhello-1.0.tar.gz b/doc/amhello-1.0.tar.gz
index 6f91c77e1..3f7b52195 100644
--- a/doc/amhello-1.0.tar.gz
+++ b/doc/amhello-1.0.tar.gz
Binary files differ
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index 7a5013a6f..d7be13707 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/configure.ac b/doc/amhello/configure.ac
index ea0951a4e..0090349db 100644
--- a/doc/amhello/configure.ac
+++ b/doc/amhello/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
# This configure.ac script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 22980c993..eff76040b 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/main.c b/doc/amhello/src/main.c
index 2186c9dfd..322678171 100644
--- a/doc/amhello/src/main.c
+++ b/doc/amhello/src/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2021 Free Software Foundation, Inc.
This program is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. */
diff --git a/doc/automake-history.info b/doc/automake-history.info
index 37e54384e..b2b062d96 100644
--- a/doc/automake-history.info
+++ b/doc/automake-history.info
@@ -1,10 +1,10 @@
-This is automake-history.info, produced by makeinfo version 6.7 from
+This is automake-history.info, produced by makeinfo version 6.8 from
automake-history.texi.
This manual describes (part of) the history of GNU Automake, a program
that creates GNU standards-compliant Makefiles from template files.
- Copyright (C) 1995-2020 Free Software Foundation, Inc.
+ Copyright (C) 1995-2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -27,7 +27,7 @@ Brief History of Automake
This manual describes (part of) the history of GNU Automake, a program
that creates GNU standards-compliant Makefiles from template files.
- Copyright (C) 1995-2020 Free Software Foundation, Inc.
+ Copyright (C) 1995-2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -1190,7 +1190,7 @@ A.1 GNU Free Documentation License
Version 1.3, 3 November 2008
- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000-2021 Free Software Foundation, Inc.
<https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
index 96bf0c398..f9ad51c41 100644
--- a/doc/automake-history.texi
+++ b/doc/automake-history.texi
@@ -10,7 +10,7 @@
This manual describes (part of) the history of GNU Automake, a program
that creates GNU standards-compliant Makefiles from template files.
-Copyright @copyright{} 1995--2020 Free Software Foundation, Inc.
+Copyright @copyright{} 1995--2021 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/automake.info b/doc/automake.info
index 6eaaef36c..4132a33c7 100644
--- a/doc/automake.info
+++ b/doc/automake.info
@@ -1,11 +1,11 @@
-This is automake.info, produced by makeinfo version 6.7 from
+This is automake.info, produced by makeinfo version 6.8 from
automake.texi.
-This manual is for GNU Automake (version 1.16.3, 19 November 2020), a
+This manual is for GNU Automake (version 1.16.4, 16 July 2021), a
program that creates GNU standards-compliant Makefiles from template
files.
- Copyright © 1995–2020 Free Software Foundation, Inc.
+ Copyright © 1995–2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -27,216 +27,215 @@ END-INFO-DIR-ENTRY

Indirect:
-automake.info-1: 1085
-automake.info-2: 301619
+automake.info-1: 1081
+automake.info-2: 301558

Tag Table:
(Indirect)
-Node: Top1085
-Node: Introduction14340
-Ref: Introduction-Footnote-115749
-Node: Autotools Introduction15908
-Node: GNU Build System17290
-Node: Use Cases20038
-Node: Basic Installation22166
-Node: Standard Targets25752
-Node: Standard Directory Variables27355
-Node: Standard Configuration Variables29212
-Node: config.site30571
-Node: VPATH Builds31997
-Node: Two-Part Install36055
-Node: Cross-Compilation38499
-Node: Renaming41474
-Node: DESTDIR42632
-Node: Preparing Distributions44814
-Node: Dependency Tracking47184
-Node: Nested Packages49292
-Node: Why Autotools50808
-Node: Hello World52450
-Ref: amhello Explained52872
-Node: Creating amhello53044
-Node: amhello's configure.ac Setup Explained58399
-Node: amhello's Makefile.am Setup Explained63319
-Node: Generalities67019
-Node: General Operation67713
-Node: Strictness71137
-Ref: Gnits71271
-Node: Uniform75176
-Node: Length Limitations80115
-Node: Canonicalization82426
-Node: User Variables83498
-Node: Auxiliary Programs84988
-Node: Examples88925
-Node: Complete89795
-Node: true91900
-Node: automake Invocation94391
-Ref: Invoking automake94546
-Node: configure103161
-Node: Requirements104090
-Node: Optional109328
-Node: aclocal Invocation118730
-Ref: Invoking aclocal118891
-Node: aclocal Options121945
-Node: Macro Search Path125671
-Ref: ACLOCAL_PATH130045
-Node: Extending aclocal131615
-Node: Local Macros135339
-Node: Serials139323
-Node: Future of aclocal144543
-Node: Macros146932
-Node: Public Macros147473
-Ref: Modernize AM_INIT_AUTOMAKE invocation149096
-Node: Obsolete Macros153578
-Node: Private Macros154920
-Node: Directories156370
-Node: Subdirectories157965
-Node: Conditional Subdirectories161357
-Node: SUBDIRS vs DIST_SUBDIRS163038
-Node: Subdirectories with AM_CONDITIONAL164676
-Node: Subdirectories with AC_SUBST165870
-Node: Unconfigured Subdirectories166697
-Node: Alternative170152
-Ref: Alternative-Footnote-1172304
-Node: Subpackages172429
-Node: Programs175775
-Node: A Program177317
-Node: Program Sources178040
-Node: Linking179945
-Node: Conditional Sources183590
-Node: Conditional Programs186518
-Node: A Library188408
-Node: A Shared Library191085
-Node: Libtool Concept192089
-Node: Libtool Libraries194179
-Node: Conditional Libtool Libraries195913
-Node: Conditional Libtool Sources198370
-Node: Libtool Convenience Libraries199757
-Node: Libtool Modules203185
-Node: Libtool Flags204501
-Node: LTLIBOBJS206412
-Node: Libtool Issues207047
-Node: Error required file ltmain.sh not found207388
-Node: Objects created both with libtool and without208609
-Node: Program and Library Variables210532
-Ref: Program and Library Variables-Footnote-1221910
-Node: Default _SOURCES221985
-Node: LIBOBJS224462
-Node: Program Variables229689
-Node: Yacc and Lex233252
-Ref: Yacc and Lex-Footnote-1238880
-Node: C++ Support239143
-Node: Objective C Support240023
-Node: Objective C++ Support240996
-Node: Unified Parallel C Support242018
-Node: Assembly Support243014
-Node: Fortran 77 Support244186
-Ref: Fortran 77 Support-Footnote-1245871
-Node: Preprocessing Fortran 77246074
-Node: Compiling Fortran 77 Files246678
-Node: Mixing Fortran 77 With C and C++247290
-Ref: Mixing Fortran 77 With C and C++-Footnote-1249613
-Node: How the Linker is Chosen249921
-Node: Fortran 9x Support251460
-Node: Compiling Fortran 9x Files252506
-Node: Java Support with gcj253142
-Node: Vala Support254623
-Node: Support for Other Languages256896
-Node: Dependencies257604
-Node: EXEEXT259491
-Node: Other Objects261731
-Node: Scripts262323
-Node: Headers265182
-Node: Data266985
-Node: Sources267670
-Node: Built Sources Example270685
-Node: Other GNU Tools277873
-Node: Emacs Lisp278402
-Node: gettext280500
-Node: Libtool281188
-Node: Java281447
-Node: Python284106
-Node: Documentation289203
-Node: Texinfo289507
-Node: Man Pages296705
-Node: Install299830
-Node: Basics of Installation301619
-Node: The Two Parts of Install303149
-Node: Extending Installation304689
-Node: Staged Installs305453
-Node: Install Rules for the User306866
-Node: Clean307424
-Node: Dist309596
-Node: Basics of Distribution310100
-Node: Fine-grained Distribution Control313443
-Node: The dist Hook314370
-Node: Checking the Distribution316916
-Node: The Types of Distributions324223
-Node: Tests327038
-Node: Generalities about Testing328234
-Node: Simple Tests331171
-Node: Scripts-based Testsuites331552
-Ref: Testsuite progress on console333925
-Ref: Simple tests and color-tests336018
-Node: Serial Test Harness340041
-Node: Parallel Test Harness342146
-Ref: Basics of test metadata342652
-Node: Custom Test Drivers351384
-Node: Overview of Custom Test Drivers Support351675
-Node: Declaring Custom Test Drivers354727
-Node: API for Custom Test Drivers356149
-Node: Command-line arguments for test drivers356925
-Node: Log files generation and test results recording359639
-Node: Testsuite progress output363854
-Node: Using the TAP test protocol365276
-Node: Introduction to TAP365638
-Node: Use TAP with the Automake test harness367422
-Node: Incompatibilities with other TAP parsers and drivers372845
-Node: Links and external resources on TAP374246
-Node: DejaGnu Tests375838
-Node: Install Tests377966
-Node: Rebuilding378276
-Node: Options381954
-Node: Options generalities382255
-Node: List of Automake options384036
-Ref: tar-formats390771
-Node: Miscellaneous394284
-Node: Tags394629
-Node: Suffixes397746
-Node: Include399378
-Node: Conditionals401113
-Node: Usage of Conditionals401971
-Node: Limits of Conditionals405329
-Node: Silencing Make406514
-Node: Make verbosity406870
-Ref: Make verbosity-Footnote-1408192
-Node: Tricks For Silencing Make408266
-Node: Automake Silent Rules410773
-Node: Not Enough417759
-Node: Extending418215
-Node: Third-Party Makefiles423249
-Node: Distributing430314
-Node: API Versioning430963
-Node: Upgrading433668
-Node: FAQ435713
-Node: CVS436837
-Node: maintainer-mode445282
-Node: Wildcards449454
-Node: Limitations on File Names452893
-Node: Errors with distclean455523
-Node: Flag Variables Ordering460472
-Node: Renamed Objects468308
-Node: Per-Object Flags469899
-Node: Multiple Outputs472909
-Node: Hard-Coded Install Paths485268
-Node: Debugging Make Rules490433
-Ref: Debugging Make Rules-Footnote-1492594
-Node: Reporting Bugs492772
-Node: Copying This Manual494583
-Node: GNU Free Documentation License494813
-Node: Indices520134
-Node: Macro Index520423
-Node: Variable Index526062
-Node: General Index557783
+Node: Top1081
+Node: Introduction14332
+Ref: Introduction-Footnote-115741
+Node: Autotools Introduction15900
+Node: GNU Build System17282
+Node: Use Cases20030
+Node: Basic Installation22158
+Node: Standard Targets25744
+Node: Standard Directory Variables27347
+Node: Standard Configuration Variables29204
+Node: config.site30563
+Node: VPATH Builds31989
+Node: Two-Part Install36047
+Node: Cross-Compilation38491
+Node: Renaming41457
+Node: DESTDIR42615
+Node: Preparing Distributions44797
+Node: Dependency Tracking47167
+Node: Nested Packages49275
+Node: Why Autotools50791
+Node: Hello World52433
+Ref: amhello Explained52855
+Node: Creating amhello53027
+Node: amhello's configure.ac Setup Explained58382
+Node: amhello's Makefile.am Setup Explained63303
+Node: Generalities67003
+Node: General Operation67697
+Node: Strictness71121
+Ref: Gnits71255
+Node: Uniform75155
+Node: Length Limitations80052
+Node: Canonicalization82363
+Node: User Variables83435
+Node: Auxiliary Programs84925
+Node: Examples88862
+Node: Complete89732
+Node: true91837
+Node: automake Invocation94328
+Ref: Invoking automake94483
+Node: configure103098
+Node: Requirements104027
+Node: Optional109265
+Node: aclocal Invocation119008
+Ref: Invoking aclocal119169
+Node: aclocal Options122207
+Node: Macro Search Path125917
+Ref: ACLOCAL_PATH130291
+Node: Extending aclocal131861
+Node: Local Macros135560
+Node: Serials139543
+Node: Future of aclocal144763
+Node: Macros147113
+Node: Public Macros147654
+Ref: Modernize AM_INIT_AUTOMAKE invocation149277
+Node: Obsolete Macros153759
+Node: Private Macros155101
+Node: Directories156551
+Node: Subdirectories158146
+Node: Conditional Subdirectories161538
+Node: SUBDIRS vs DIST_SUBDIRS163219
+Node: Subdirectories with AM_CONDITIONAL164857
+Node: Subdirectories with AC_SUBST166051
+Node: Unconfigured Subdirectories166878
+Node: Alternative170336
+Ref: Alternative-Footnote-1172488
+Node: Subpackages172613
+Node: Programs175968
+Node: A Program177510
+Node: Program Sources178233
+Node: Linking180138
+Node: Conditional Sources183782
+Node: Conditional Programs186710
+Node: A Library188600
+Node: A Shared Library191277
+Node: Libtool Concept192281
+Node: Libtool Libraries194371
+Node: Conditional Libtool Libraries196105
+Node: Conditional Libtool Sources198562
+Node: Libtool Convenience Libraries199949
+Node: Libtool Modules203376
+Node: Libtool Flags204692
+Node: LTLIBOBJS206603
+Node: Libtool Issues207238
+Node: Error required file ltmain.sh not found207579
+Node: Objects created both with libtool and without208800
+Node: Program and Library Variables210716
+Node: Default _SOURCES222876
+Node: LIBOBJS225353
+Node: Program Variables230580
+Node: Yacc and Lex234125
+Ref: Yacc and Lex-Footnote-1239753
+Node: C++ Support240016
+Node: Objective C Support240878
+Node: Objective C++ Support241834
+Node: Unified Parallel C Support242839
+Node: Assembly Support243817
+Node: Fortran 77 Support244989
+Ref: Fortran 77 Support-Footnote-1246656
+Node: Preprocessing Fortran 77246859
+Node: Compiling Fortran 77 Files247463
+Node: Mixing Fortran 77 With C and C++248075
+Ref: Mixing Fortran 77 With C and C++-Footnote-1250398
+Node: How the Linker is Chosen250706
+Node: Fortran 9x Support252245
+Node: Compiling Fortran 9x Files253273
+Node: Java Support with gcj253909
+Node: Vala Support255390
+Node: Support for Other Languages257663
+Node: Dependencies258371
+Node: EXEEXT260258
+Node: Other Objects262498
+Node: Scripts263080
+Node: Headers265939
+Node: Data267734
+Node: Sources268419
+Node: Built Sources Example271424
+Node: Other GNU Tools278596
+Node: Emacs Lisp279125
+Node: gettext281222
+Node: Libtool281910
+Node: Java282169
+Node: Python284828
+Node: Documentation289863
+Node: Texinfo290167
+Node: Man Pages297352
+Node: Install301558
+Node: Basics of Installation302253
+Node: The Two Parts of Install303783
+Node: Extending Installation305323
+Node: Staged Installs306087
+Node: Install Rules for the User307500
+Node: Clean308058
+Node: Dist310230
+Node: Basics of Distribution310734
+Node: Fine-grained Distribution Control314907
+Node: The dist Hook315834
+Node: Checking the Distribution318364
+Node: The Types of Distributions325671
+Node: Tests328824
+Node: Generalities about Testing330020
+Node: Simple Tests332960
+Node: Scripts-based Testsuites333341
+Ref: Testsuite progress on console335714
+Ref: Simple tests and color-tests337807
+Node: Serial Test Harness341830
+Node: Parallel Test Harness343920
+Ref: Basics of test metadata344426
+Node: Custom Test Drivers353519
+Node: Overview of Custom Test Drivers Support353810
+Node: Declaring Custom Test Drivers356862
+Node: API for Custom Test Drivers358284
+Node: Command-line arguments for test drivers359056
+Node: Log files generation and test results recording361770
+Node: Testsuite progress output365985
+Node: Using the TAP test protocol367407
+Node: Introduction to TAP367769
+Node: Use TAP with the Automake test harness369553
+Node: Incompatibilities with other TAP parsers and drivers374976
+Node: Links and external resources on TAP376377
+Node: DejaGnu Tests377969
+Node: Install Tests380097
+Node: Rebuilding380407
+Node: Options384501
+Node: Options generalities384802
+Node: List of Automake options386583
+Ref: tar-formats393990
+Node: Miscellaneous397503
+Node: Tags397848
+Node: Suffixes401044
+Node: Include402676
+Node: Conditionals404411
+Node: Usage of Conditionals405269
+Node: Limits of Conditionals408627
+Node: Silencing Make409812
+Node: Make verbosity410168
+Ref: Make verbosity-Footnote-1411490
+Node: Tricks For Silencing Make411564
+Node: Automake Silent Rules414071
+Node: Not Enough421049
+Node: Extending421505
+Node: Third-Party Makefiles426539
+Node: Distributing433598
+Node: API Versioning434247
+Node: Upgrading436952
+Node: FAQ438997
+Node: CVS440121
+Node: maintainer-mode448557
+Node: Wildcards452732
+Node: Limitations on File Names456170
+Node: Errors with distclean458800
+Node: Flag Variables Ordering463742
+Node: Renamed Objects471751
+Node: Per-Object Flags473346
+Node: Multiple Outputs476356
+Node: Hard-Coded Install Paths488700
+Node: Debugging Make Rules493844
+Ref: Debugging Make Rules-Footnote-1495990
+Node: Reporting Bugs496168
+Node: Copying This Manual497806
+Node: GNU Free Documentation License498036
+Node: Indices523340
+Node: Macro Index523629
+Node: Variable Index529479
+Node: General Index562289

End Tag Table
diff --git a/doc/automake.info-1 b/doc/automake.info-1
index 922a4ee7c..5771278bf 100644
--- a/doc/automake.info-1
+++ b/doc/automake.info-1
@@ -1,11 +1,11 @@
-This is automake.info, produced by makeinfo version 6.7 from
+This is automake.info, produced by makeinfo version 6.8 from
automake.texi.
-This manual is for GNU Automake (version 1.16.3, 19 November 2020), a
+This manual is for GNU Automake (version 1.16.4, 16 July 2021), a
program that creates GNU standards-compliant Makefiles from template
files.
- Copyright © 1995–2020 Free Software Foundation, Inc.
+ Copyright © 1995–2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -31,11 +31,11 @@ File: automake.info, Node: Top, Next: Introduction, Up: (dir)
GNU Automake
************
-This manual is for GNU Automake (version 1.16.3, 19 November 2020), a
+This manual is for GNU Automake (version 1.16.4, 16 July 2021), a
program that creates GNU standards-compliant Makefiles from template
files.
- Copyright © 1995–2020 Free Software Foundation, Inc.
+ Copyright © 1995–2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -952,8 +952,8 @@ architecture.
For instance when installing GCC, the GNU Compiler Collection, we can
use ‘--target=TARGET’ to specify that we want to build GCC as a
cross-compiler for TARGET. Mixing ‘--build’ and ‘--target’, we can
-actually cross-compile a cross-compiler; such a three-way
-cross-compilation is known as a “Canadian cross”.
+cross-compile a cross-compiler; such a three-way cross-compilation is
+known as a “Canadian cross”.
*Note Specifying the System Type: (autoconf)Specifying Names, for
more information about these ‘configure’ options.
@@ -1429,7 +1429,7 @@ defined a few of them. Here is an excerpt of ‘config.h’ after
As you probably noticed, ‘src/main.c’ includes ‘config.h’ so it can
use ‘PACKAGE_STRING’. In a real-world project, ‘config.h’ can grow
-really big, with one ‘#define’ per feature probed on the system.
+quite large, with one ‘#define’ per feature probed on the system.
The ‘AC_CONFIG_FILES’ macro declares the list of files that
‘configure’ should create from their ‘*.in’ templates. Automake also
@@ -1560,11 +1560,11 @@ includes a non-standard rule for the ‘git-dist’ target, which the
Automake maintainer uses to make distributions from the source control
system.
- Note that most GNU make extensions are not recognized by Automake.
+ Note that most GNU Make extensions are not recognized by Automake.
Using such extensions in a ‘Makefile.am’ will lead to errors or
confusing behavior.
- A special exception is that the GNU make append operator, ‘+=’, is
+ A special exception is that the GNU Make append operator, ‘+=’, is
supported. This operator appends its right hand argument to the
variable specified on the left. Automake will translate the operator
into an ordinary ‘=’ operator; ‘+=’ will thus work with any make
@@ -1636,7 +1636,7 @@ see *note Options::.
‘gnu’
This is the default level of strictness. Automake will check for
basic compliance with the GNU standards for software packaging.
- *Note (standards)Top:: for full details of these standards.
+ *Note (standards)Top::, for full details of these standards.
Currently the following checks are made:
• The files ‘INSTALL’, ‘NEWS’, ‘README’, ‘AUTHORS’, and
@@ -1678,14 +1678,14 @@ see *note Options::.
standards”. These are based on the GNU standards, but are even
more detailed. Unless you are a Gnits standards contributor, it is
recommended that you avoid this option until such time as the Gnits
- standard is actually published (which may never happen).
+ standard is published (which is unlikely to ever happen).
Currently, ‘--gnits’ does all the checks that ‘--gnu’ does, and
checks the following as well:
• ‘make installcheck’ will check to make sure that the ‘--help’
- and ‘--version’ really print a usage message and a version
- string, respectively. This is the ‘std-options’ option (*note
+ and ‘--version’ print a usage message and a version string,
+ respectively. This is the ‘std-options’ option (*note
Options::).
• ‘make dist’ will check to make sure the ‘NEWS’ file has been
@@ -1757,8 +1757,8 @@ variable names; thus one writes ‘bin_PROGRAMS’ and not
Not every sort of object can be installed in every directory.
Automake will flag those attempts it finds in error (but see below how
-to override the check if you really need to). Automake will also
-diagnose obvious misspellings in directory names.
+to override the check if you need to). Automake will also diagnose
+obvious misspellings in directory names.
Sometimes the standard directories—even as augmented by Automake—are
not enough. In particular it is sometimes useful, for clarity, to
@@ -1775,8 +1775,8 @@ same name with ‘dir’ appended is defined (e.g., ‘zardir’).
This feature can also be used to override the sanity checks Automake
performs to diagnose suspicious directory/primary couples (in the
-unlikely case these checks are undesirable, and you really know what
-you’re doing). For example, Automake would error out on this input:
+unlikely case that you need to omit these checks). For example,
+Automake would error out on this input:
# Forbidden directory combinations, automake will error out on this.
pkglib_PROGRAMS = foo
@@ -2514,6 +2514,12 @@ their effects are:
always searched for; some scripts will only be sought if the
generated ‘Makefile.in’ requires them.
+ If ‘AC_CONFIG_AUX_DIR’ is used, it must be given before the call to
+ ‘AM_INIT_AUTOMAKE’; Automake will warn about this if it is not so.
+ All other ‘AC_CONFIG_...’ macros are conventionally called after
+ ‘AM_INIT_AUTOMAKE’, though they may or may not work in other
+ locations, with or without warnings.
+
If ‘AC_CONFIG_AUX_DIR’ is not given, the scripts are looked for in
their standard locations. For ‘mdate-sh’, ‘texinfo.tex’, and
‘ylwrap’, the standard location is the source directory
@@ -2532,20 +2538,21 @@ their effects are:
‘AC_CONFIG_HEADERS’
Automake will generate rules to rebuild these headers from the
corresponding templates (usually, the template for a ‘foo.h’ header
- being ‘foo.h.in’). Older versions of Automake required the use of
- ‘AM_CONFIG_HEADER’; this is no longer the case, and that macro has
- indeed been removed.
+ being ‘foo.h.in’).
As with ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the
specification using shell variables will be ignored as far as
cleaning, distributing, and rebuilding is concerned.
+ Older versions of Automake required the use of ‘AM_CONFIG_HEADER’;
+ this is no longer the case, and that macro has indeed been removed.
+
‘AC_CONFIG_LINKS’
Automake will generate rules to remove ‘configure’ generated links
on ‘make distclean’ and to distribute named source files as part of
‘make dist’.
- As for ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the
+ As with ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the
specification using shell variables will be ignored as far as
cleaning and distributing is concerned. (There are no rebuild
rules for links.)
@@ -2692,9 +2699,9 @@ File: automake.info, Node: aclocal Invocation, Next: Macros, Prev: Optional,
==============================
Automake includes a number of Autoconf macros that can be used in your
-package (*note Macros::); some of them are actually required by Automake
-in certain situations. These macros must be defined in your
-‘aclocal.m4’; otherwise they will not be seen by ‘autoconf’.
+package (*note Macros::); some of them are required by Automake in
+certain situations. These macros must be defined in your ‘aclocal.m4’;
+otherwise they will not be seen by ‘autoconf’.
The ‘aclocal’ program will automatically generate ‘aclocal.m4’ files
based on the contents of ‘configure.ac’. This provides a convenient way
@@ -2731,10 +2738,10 @@ automatically included in ‘aclocal.m4’. We recommend against using
While computing ‘aclocal.m4’, ‘aclocal’ runs ‘autom4te’ (*note Using
‘Autom4te’: (autoconf)Using autom4te.) in order to trace the macros that
-are really used, and omit from ‘aclocal.m4’ all macros that are
-mentioned but otherwise unexpanded (this can happen when a macro is
-called conditionally). ‘autom4te’ is expected to be in the ‘PATH’, just
-as ‘autoconf’. Its location can be overridden using the ‘AUTOM4TE’
+are used, and omit from ‘aclocal.m4’ all macros that are mentioned but
+otherwise unexpanded (this can happen when a macro is called
+conditionally). ‘autom4te’ is expected to be in the ‘PATH’, just as
+‘autoconf’. Its location can be overridden using the ‘AUTOM4TE’
environment variable.
* Menu:
@@ -2773,8 +2780,8 @@ File: automake.info, Node: aclocal Options, Next: Macro Search Path, Up: aclo
implies ‘--install’ and ‘--dry-run’.
‘--dry-run’
- Do not actually overwrite (or create) ‘aclocal.m4’ and M4 files
- installed by ‘--install’.
+ Do not overwrite (or create) ‘aclocal.m4’ and M4 files installed by
+ ‘--install’.
‘--help’
Print a summary of the command line options and exit.
@@ -2796,8 +2803,8 @@ File: automake.info, Node: aclocal Options, Next: Macro Search Path, Up: aclo
‘--force’
Always overwrite the output file. The default is to overwrite the
- output file only when really needed, i.e., when its contents change
- or if one of its dependencies is younger.
+ output file only when needed, i.e., when its contents change or if
+ one of its dependencies is younger.
This option forces the update of ‘aclocal.m4’ (or the file
specified with ‘--output’ below) and only this file, it has
@@ -3024,17 +3031,17 @@ side effects but macro definitions. Especially, any call to ‘AC_PREREQ’
should be done inside the defined macro, not at the beginning of the
file.
- Starting with Automake 1.8, ‘aclocal’ will warn about all underquoted
-calls to ‘AC_DEFUN’. We realize this will annoy a lot of people,
-because ‘aclocal’ was not so strict in the past and many third party
-macros are underquoted; and we have to apologize for this temporary
-inconvenience. The reason we have to be stricter is that a future
-implementation of ‘aclocal’ (*note Future of aclocal::) will have to
-temporarily include all of these third party ‘.m4’ files, maybe several
-times, including even files that are not actually needed. Doing so
-should alleviate many problems of the current implementation; however it
-requires a stricter style from the macro authors. Hopefully it is easy
-to revise the existing macros. For instance,
+ Starting with Automake 1.8, ‘aclocal’ warns about all underquoted
+calls to ‘AC_DEFUN’. We realize this annoys some people, because
+‘aclocal’ was not so strict in the past and many third party macros are
+underquoted; and we have to apologize for this temporary inconvenience.
+The reason we have to be stricter is that a future implementation of
+‘aclocal’ (*note Future of aclocal::) will have to temporarily include
+all of these third party ‘.m4’ files, maybe several times, even
+including files that end up not being needed. Doing so should alleviate
+many problems of the current implementation; however, it requires a
+stricter style from macro authors. Hopefully it is easy to revise the
+existing macros. For instance,
# bad style
AC_PREREQ(2.68)
@@ -3054,10 +3061,10 @@ should be rewritten as
])
Wrapping the ‘AC_PREREQ’ call inside the macro ensures that Autoconf
-2.68 will not be required if ‘AX_FOOBAR’ is not actually used. Most
-importantly, quoting the first argument of ‘AC_DEFUN’ allows the macro
-to be redefined or included twice (otherwise this first argument would
-be expanded during the second definition). For consistency we like to
+2.68 will not be required if ‘AX_FOOBAR’ is not used. Most importantly,
+quoting the first argument of ‘AC_DEFUN’ allows the macro to be
+redefined or included twice (otherwise this first argument would be
+expanded during the second definition). For consistency we like to
quote even arguments such as ‘2.68’ that do not require it.
If you have been directed here by the ‘aclocal’ diagnostic but are
@@ -3105,7 +3112,7 @@ explained in *note Macro Search Path::.
Custom macros should be distributed for the same reason that
‘configure.ac’ is: so that other people have all the sources of your
-package if they want to work on it. Actually, this distribution happens
+package if they want to work on it. In fact, this distribution happens
automatically because all ‘m4_include’d files are distributed.
However there is no consensus on the distribution of third-party
@@ -3268,11 +3275,11 @@ File: automake.info, Node: Future of aclocal, Prev: Serials, Up: aclocal Invo
6.3.6 The Future of ‘aclocal’
-----------------------------
-‘aclocal’ is expected to disappear. This feature really should not be
-offered by Automake. Automake should focus on generating ‘Makefile’s;
-dealing with M4 macros really is Autoconf’s job. The fact that some
-people install Automake just to use ‘aclocal’, but do not use ‘automake’
-otherwise is an indication of how that feature is misplaced.
+Ideally, ‘aclocal’ should not be part of Automake. Automake should
+focus on generating ‘Makefile’s; dealing with M4 macros is more
+Autoconf’s job. The fact that some people install Automake just to use
+‘aclocal’, but do not use ‘automake’ otherwise is an indication of how
+that feature is misplaced.
The new implementation will probably be done slightly differently.
For instance, it could enforce the ‘m4/’-style layout discussed in *note
@@ -3294,18 +3301,18 @@ script, you will quickly notice the change.
Many packages come with a script called ‘bootstrap’ or ‘autogen.sh’,
that will just call ‘aclocal’, ‘libtoolize’, ‘gettextize’ or
‘autopoint’, ‘autoconf’, ‘autoheader’, and ‘automake’ in the right
-order. Actually this is precisely what ‘autoreconf’ can do for you. If
+order. In fact, this is precisely what ‘autoreconf’ can do for you. If
your package has such a ‘bootstrap’ or ‘autogen.sh’ script, consider
using ‘autoreconf’. That should simplify its logic a lot (less things
-to maintain, yum!), it’s even likely you will not need the script
-anymore, and more to the point you will not call ‘aclocal’ directly
-anymore.
+to maintain, all to the good), it’s even likely you will not need the
+script anymore, and more to the point you will not call ‘aclocal’
+directly anymore.
For the time being, third-party packages should continue to install
public macros into ‘/usr/share/aclocal/’. If ‘aclocal’ is replaced by
another tool it might make sense to rename the directory, but supporting
-‘/usr/share/aclocal/’ for backward compatibility should be really easy
-provided all macros are properly written (*note Extending aclocal::).
+‘/usr/share/aclocal/’ for backward compatibility should be easy provided
+all macros are properly written (*note Extending aclocal::).

File: automake.info, Node: Macros, Prev: aclocal Invocation, Up: configure
@@ -3793,8 +3800,8 @@ remember.
• Any directory listed in ‘DIST_SUBDIRS’ and ‘SUBDIRS’ must be
configured.
- I.e., the ‘Makefile’ must exist or the recursive ‘make’ rules will
- not be able to process the directory.
+ That is, the ‘Makefile’ must exist or the recursive ‘make’ rules
+ will not be able to process the directory.
• Any configured directory must be listed in ‘DIST_SUBDIRS’.
This is so the cleaning rules remove the generated ‘Makefile’s. It
@@ -3962,9 +3969,9 @@ in the ‘hand/’ subdirectory for the ‘hand’ package.
the parent directory and the grandparent directory. So if the
‘AC_CONFIG_AUX_DIR([.])’ line was removed from ‘hand/configure.ac’, that
subpackage would share the auxiliary script of the ‘arm’ package. This
-may look like a gain in size (a few kilobytes), but it is actually a
-loss of modularity as the ‘hand’ subpackage is no longer self-contained
-(‘make dist’ in the subdirectory will not work anymore).
+may look like a gain in size (a few kilobytes), but more importantly, it
+is a loss of modularity as the ‘hand’ subpackage is no longer
+self-contained (‘make dist’ in the subdirectory will not work anymore).
Packages that do not use Automake need more work to be integrated
this way. *Note Third-Party Makefiles::.
@@ -4109,8 +4116,8 @@ flags (except for ‘-l’, ‘-L’, ‘-dlopen’ and ‘-dlpreopen’). So,
‘PROG_LDFLAGS’ variable for this purpose.
It is also occasionally useful to have a program depend on some other
-target that is not actually part of that program. This can be done
-using either the ‘PROG_DEPENDENCIES’ or the ‘EXTRA_PROG_DEPENDENCIES’
+target that is not in fact part of that program. This can be done using
+either the ‘PROG_DEPENDENCIES’ or the ‘EXTRA_PROG_DEPENDENCIES’
variable. Each program depends on the contents both variables, but no
further interpretation is done.
@@ -4543,7 +4550,7 @@ big installed library.
Libtool convenience libraries are declared by directory-less
variables such as ‘noinst_LTLIBRARIES’, ‘check_LTLIBRARIES’, or even
‘EXTRA_LTLIBRARIES’. Unlike installed libtool libraries they do not
-need an ‘-rpath’ flag at link time (actually this is the only
+need an ‘-rpath’ flag at link time (this is in fact the only
difference).
Convenience libraries listed in ‘noinst_LTLIBRARIES’ are always
@@ -4750,7 +4757,7 @@ library).
(In this trivial case the issue could be avoided by linking ‘libfoo.la’
with ‘prog’ instead of listing ‘foo.c’ in ‘prog_SOURCES’. But let’s
-assume we really want to keep ‘prog’ and ‘libfoo.la’ separate.)
+assume we want to keep ‘prog’ and ‘libfoo.la’ separate.)
Technically, it means that we should build ‘foo.$(OBJEXT)’ for
‘prog’, and ‘foo.lo’ for ‘libfoo.la’. The problem is that in the course
@@ -4826,15 +4833,23 @@ libraries differ.
‘subdir-objects’ is in effect in the current directory then the
‘.o’ file will be put into the subdirectory named after the source
file. For instance, with ‘subdir-objects’ enabled,
- ‘sub/dir/file.c’ will be compiled to ‘sub/dir/file.o’. Some people
- prefer this mode of operation. You can specify ‘subdir-objects’ in
- ‘AUTOMAKE_OPTIONS’ (*note Options::).
+ ‘sub/dir/file.c’ will be compiled to ‘sub/dir/file.o’. Some
+ projects prefer or require this mode of operation. You can specify
+ ‘subdir-objects’ in ‘AUTOMAKE_OPTIONS’ (*note Options::).
+
+ When ‘subdir-objects’ is specified, and source files which lie
+ outside the current directory tree are nevertheless specified, as
+ in ‘foo_SOURCES = ../lib/other.c’, Automake will still remove
+ ‘../lib/other.o’, in fact, ‘../lib/*.o’ (e.g., at ‘make clean’,
+ even though it is arguably wrong for one subdirectory to clean in a
+ sibling. This may or may not be changed in the future.
‘EXTRA_maude_SOURCES’
Automake needs to know the list of files you intend to compile
_statically_. For one thing, this is the only way Automake has of
knowing what sort of language support a given ‘Makefile.in’
- requires. (1) This means that, for example, you can’t put a
+ requires. (There are other, more obscure reasons for this
+ limitation as well.) This means that, for example, you can’t put a
configure substitution like ‘@my_sources@’ into a ‘_SOURCES’
variable. If you intend to conditionally compile source files and
use ‘configure’ to substitute the appropriate object names into,
@@ -4886,7 +4901,9 @@ libraries differ.
‘maude_LDFLAGS’
This variable is used to pass extra flags to the link step of a
program or a shared library. It overrides the ‘AM_LDFLAGS’
- variable.
+ variable, even if it is defined only in a false branch of a
+ conditional; in other words, if ‘PROG_LDFLAGS’ is defined at all,
+ ‘AM_LDFLAGS’ will not be used.
‘maude_LIBTOOLFLAGS’
This variable is used to pass extra options to ‘libtool’. It
@@ -4898,10 +4915,10 @@ libraries differ.
‘maude_DEPENDENCIES’
‘EXTRA_maude_DEPENDENCIES’
It is also occasionally useful to have a target (program or
- library) depend on some other file that is not actually part of
- that target. This can be done using the ‘_DEPENDENCIES’ variable.
- Each target depends on the contents of such a variable, but no
- further interpretation is done.
+ library) depend on some other file that is not in fact part of that
+ target. This can be done using the ‘_DEPENDENCIES’ variable. Each
+ target depends on the contents of such a variable, but no further
+ interpretation is done.
Since these dependencies are associated with the link rule used to
create the programs they should normally list files used by the
@@ -4947,6 +4964,9 @@ libraries differ.
as ‘_CFLAGS’, ‘_LDFLAGS’ or ‘_LIBTOOLFLAGS’, in cases where they
apply.
+ If the variable ‘AM_V_*_LINK’ exists, it is used to output a status
+ line in silent mode; otherwise, ‘AM_V_GEN’ is used.
+
‘maude_CCASFLAGS’
‘maude_CFLAGS’
‘maude_CPPFLAGS’
@@ -5005,11 +5025,6 @@ libraries differ.
This facility is rarely needed in practice, and we recommend
avoiding it until you find it is required.
- ---------- Footnotes ----------
-
- (1) There are other, more obscure reasons for this limitation as
-well.
-

File: automake.info, Node: Default _SOURCES, Next: LIBOBJS, Prev: Program and Library Variables, Up: Programs
@@ -5240,8 +5255,8 @@ some special cases.
in preference to the per-executable (or per-library) ‘_CFLAGS’.
‘COMPILE’
- This is the command used to actually compile a C source file. The
- file name is appended to form the complete command line.
+ This is the command used to compile a C source file. The file name
+ is appended to form the complete command line.
‘AM_LDFLAGS’
This is the variable the ‘Makefile.am’ author can use to pass in
@@ -5249,12 +5264,12 @@ some special cases.
preference to the per-executable (or per-library) ‘_LDFLAGS’.
‘LINK’
- This is the command used to actually link a C program. It already
- includes ‘-o $@’ and the usual variable references (for instance,
- ‘CFLAGS’); it takes as “arguments” the names of the object files
- and libraries to link in. This variable is not used when the
- linker is overridden with a per-target ‘_LINK’ variable or
- per-target flags cause Automake to define such a ‘_LINK’ variable.
+ This is the command used to link a C program. It already includes
+ ‘-o $@’ and the usual variable references (for instance, ‘CFLAGS’);
+ it takes as “arguments” the names of the object files and libraries
+ to link in. This variable is not used when the linker is
+ overridden with a per-target ‘_LINK’ variable or per-target flags
+ cause Automake to define such a ‘_LINK’ variable.

File: automake.info, Node: Yacc and Lex, Next: C++ Support, Prev: Program Variables, Up: Programs
@@ -5417,11 +5432,11 @@ seen:
The maintainer’s variant of ‘CXXFLAGS’.
‘CXXCOMPILE’
- The command used to actually compile a C++ source file. The file
- name is appended to form the complete command line.
+ The command used to compile a C++ source file. The file name is
+ appended to form the complete command line.
‘CXXLINK’
- The command used to actually link a C++ program.
+ The command used to link a C++ program.

File: automake.info, Node: Objective C Support, Next: Objective C++ Support, Prev: C++ Support, Up: Programs
@@ -5449,11 +5464,11 @@ file is seen:
The maintainer’s variant of ‘OBJCFLAGS’.
‘OBJCCOMPILE’
- The command used to actually compile an Objective C source file.
- The file name is appended to form the complete command line.
+ The command used to compile an Objective C source file. The file
+ name is appended to form the complete command line.
‘OBJCLINK’
- The command used to actually link an Objective C program.
+ The command used to link an Objective C program.

File: automake.info, Node: Objective C++ Support, Next: Unified Parallel C Support, Prev: Objective C Support, Up: Programs
@@ -5481,11 +5496,11 @@ file is seen:
The maintainer’s variant of ‘OBJCXXFLAGS’.
‘OBJCXXCOMPILE’
- The command used to actually compile an Objective C++ source file.
- The file name is appended to form the complete command line.
+ The command used to compile an Objective C++ source file. The file
+ name is appended to form the complete command line.
‘OBJCXXLINK’
- The command used to actually link an Objective C++ program.
+ The command used to link an Objective C++ program.

File: automake.info, Node: Unified Parallel C Support, Next: Assembly Support, Prev: Objective C++ Support, Up: Programs
@@ -5512,11 +5527,11 @@ source file is seen:
The maintainer’s variant of ‘UPCFLAGS’.
‘UPCCOMPILE’
- The command used to actually compile a Unified Parallel C source
- file. The file name is appended to form the complete command line.
+ The command used to compile a Unified Parallel C source file. The
+ file name is appended to form the complete command line.
‘UPCLINK’
- The command used to actually link a Unified Parallel C program.
+ The command used to link a Unified Parallel C program.

File: automake.info, Node: Assembly Support, Next: Fortran 77 Support, Prev: Unified Parallel C Support, Up: Programs
@@ -5575,12 +5590,12 @@ is seen:
The maintainer’s variant of ‘RFLAGS’.
‘F77COMPILE’
- The command used to actually compile a Fortran 77 source file. The
- file name is appended to form the complete command line.
+ The command used to compile a Fortran 77 source file. The file
+ name is appended to form the complete command line.
‘FLINK’
- The command used to actually link a pure Fortran 77 program or
- shared library.
+ The command used to link a pure Fortran 77 program or shared
+ library.
Automake can handle preprocessing Fortran 77 and Ratfor source files
in addition to compiling them(1). Automake also contains some support
@@ -5761,12 +5776,12 @@ is seen:
The maintainer’s variant of ‘FCFLAGS’.
‘FCCOMPILE’
- The command used to actually compile a Fortran 9x source file. The
- file name is appended to form the complete command line.
+ The command used to compile a Fortran 9x source file. The file
+ name is appended to form the complete command line.
‘FCLINK’
- The command used to actually link a pure Fortran 9x program or
- shared library.
+ The command used to link a pure Fortran 9x program or shared
+ library.
* Menu:
@@ -5837,7 +5852,7 @@ Automake provides initial support for Vala
(<https://www.vala-project.org/>). This requires valac version 0.7.0 or
later, and currently requires the user to use GNU ‘make’.
- foo_SOURCES = foo.vala bar.vala zardoc.c
+ foo_SOURCES = foo.vala bar.vala zardoz.c
Any ‘.vala’ file listed in a ‘_SOURCES’ variable will be compiled
into C code by the Vala compiler. The generated ‘.c’ files are
@@ -5993,9 +6008,8 @@ File: automake.info, Node: Other Objects, Next: Other GNU Tools, Prev: Progra
***********************
Automake can handle derived objects that are not C programs. Sometimes
-the support for actually building such objects must be explicitly
-supplied, but Automake will still automatically handle installation and
-distribution.
+the support for building such objects must be explicitly supplied, but
+Automake can still automatically handle installation and distribution.
* Menu:
@@ -6104,8 +6118,8 @@ will install the two files as ‘$(includedir)/foo.h’ and
Usually, only header files that accompany installed libraries need to
be installed. Headers used by programs or convenience libraries are not
installed. The ‘noinst_HEADERS’ variable can be used for such headers.
-However when the header actually belongs to a single convenience library
-or program, we recommend listing it in the program’s or library’s
+However, when the header belongs to a single convenience library or
+program, we recommend listing it in the program’s or library’s
‘_SOURCES’ variable (*note Program Sources::) instead of in
‘noinst_HEADERS’. This is clearer for the ‘Makefile.am’ reader.
‘noinst_HEADERS’ would be the right variable to use in a directory
@@ -6179,12 +6193,12 @@ _compiled_ unless explicitly requested by mentioning it in some other
= foo.h’ to ensure ‘foo.h’ gets built before any other target (including
‘foo.o’) during ‘make all’ or ‘make check’.
- ‘BUILT_SOURCES’ is actually a bit of a misnomer, as any file which
-must be created early in the build process can be listed in this
-variable. Moreover, all built sources do not necessarily have to be
-listed in ‘BUILT_SOURCES’. For instance, a generated ‘.c’ file doesn’t
-need to appear in ‘BUILT_SOURCES’ (unless it is included by another
-source), because it’s a known dependency of the associated object.
+ ‘BUILT_SOURCES’ is a bit of a misnomer, as any file which must be
+created early in the build process can be listed in this variable.
+Moreover, all built sources do not necessarily have to be listed in
+‘BUILT_SOURCES’. For instance, a generated ‘.c’ file doesn’t need to
+appear in ‘BUILT_SOURCES’ (unless it is included by another source),
+because it’s a known dependency of the associated object.
To emphasize, ‘BUILT_SOURCES’ is honored only by ‘make all’, ‘make
check’, ‘make install’, and ‘make install-exec’ (and ‘make dist’). This
@@ -6316,10 +6330,10 @@ and record such dependencies explicitly in the ‘Makefile.am’.
You don’t have to list _all_ the dependencies of ‘foo.o’ explicitly,
only those that might need to be built. If a dependency already exists,
it will not hinder the first compilation and will be recorded by the
-normal dependency tracking code. (Note that after this first
-compilation the dependency tracking code will also have recorded the
-dependency between ‘foo.o’ and ‘bindir.h’, so our explicit dependency is
-really useful to the first build only.)
+normal dependency tracking code. (After this first compilation, the
+dependency tracking code will also have recorded the dependency between
+‘foo.o’ and ‘bindir.h’, so our explicit dependency is only useful to the
+first build.)
Adding explicit dependencies like this can be a bit dangerous if you
are not careful enough. This is due to the way Automake tries not to
@@ -6425,8 +6439,8 @@ passed to the Emacs invocation.
Byte-compiled Emacs Lisp files are not portable among all versions of
Emacs, so it makes sense to turn this off if you expect sites to have
-more than one version of Emacs installed. Furthermore, many packages
-don’t actually benefit from byte-compilation. Still, we recommend that
+more than one version of Emacs installed. Furthermore, many packages do
+not actually benefit from byte-compilation. Still, we recommend that
you byte-compile your Emacs Lisp sources. It is probably better for
sites with strange setups to cope for themselves than to make the
installation less nice for everybody else.
@@ -6542,25 +6556,25 @@ File: automake.info, Node: Python, Prev: Java, Up: Other GNU Tools
Automake provides support for Python compilation with the ‘PYTHON’
primary. A typical setup is to call ‘AM_PATH_PYTHON’ in ‘configure.ac’
-and use a line like the following in ‘Makefile.am’:
+and use a line like this in ‘Makefile.am’:
python_PYTHON = tree.py leave.py
- Any files listed in a ‘_PYTHON’ variable will be byte-compiled with
-‘py-compile’ at install time. ‘py-compile’ actually creates both
-standard (‘.pyc’) and optimized (‘.pyo’) byte-compiled versions of the
-source files. Note that because byte-compilation occurs at install
-time, any files listed in ‘noinst_PYTHON’ will not be compiled. Python
-source files are included in the distribution by default; prepend
-‘nodist_’ (as in ‘nodist_python_PYTHON’) to omit them.
-
- Automake ships with an Autoconf macro called ‘AM_PATH_PYTHON’ that
-will determine some Python-related directory variables (see below). If
-you have called ‘AM_PATH_PYTHON’ from ‘configure.ac’, then you may use
-the variables ‘python_PYTHON’ or ‘pkgpython_PYTHON’ to list Python
-source files in your ‘Makefile.am’, depending on where you want your
-files installed (see the definitions of ‘pythondir’ and ‘pkgpythondir’
-below).
+ Python source files are included in the distribution by default;
+prepend ‘nodist_’ (as in ‘nodist_python_PYTHON’) to omit them.
+
+ At install time, any files listed in a ‘_PYTHON’ variable will be
+byte-compiled with ‘py-compile’. ‘py-compile’ creates both standard
+(‘.pyc’) and optimized (‘.pyo’) byte-compiled versions of the source
+files. Because byte-compilation occurs at install time, files listed in
+‘noinst_PYTHON’ will not be compiled.
+
+ Automake ships with an Autoconf macro named ‘AM_PATH_PYTHON’ that
+determines some Python-related directory variables (see below). If you
+have called ‘AM_PATH_PYTHON’ from ‘configure.ac’, then you may use the
+variables ‘python_PYTHON’ and ‘pkgpython_PYTHON’ to list Python source
+files in your ‘Makefile.am’, depending on whether you want your files
+installed in ‘pythondir’ or ‘pkgpythondir’, respectively.
-- Macro: AM_PATH_PYTHON ([VERSION], [ACTION-IF-FOUND],
[ACTION-IF-NOT-FOUND])
@@ -6574,12 +6588,12 @@ below).
run.
If ACTION-IF-NOT-FOUND is not specified, as in the following
- example, the default is to abort ‘configure’.
+ example, the default is to abort ‘configure’:
- AM_PATH_PYTHON([2.2])
+ AM_PATH_PYTHON([2.5])
This is fine when Python is an absolute requirement for the
- package. If Python >= 2.5 was only _optional_ to the package,
+ package. If Python ≥ 2.5 was only _optional_ for the package,
‘AM_PATH_PYTHON’ could be called as follows.
AM_PATH_PYTHON([2.5],, [:])
@@ -6588,7 +6602,7 @@ below).
then that will be the only Python interpreter that is tried.
‘AM_PATH_PYTHON’ creates the following output variables based on
- the Python installation found during configuration.
+ the Python installation found during configuration:
‘PYTHON’
The name of the Python executable, or ‘:’ if no suitable
@@ -6604,17 +6618,16 @@ below).
‘PYTHON_VERSION’
The Python version number, in the form MAJOR.MINOR (e.g., ‘2.5’).
- This is currently the value of ‘'%u.%u' % sys.version_info[:2]’.
+ This is set to be the value of ‘'%u.%u' % sys.version_info[:2]’.
‘PYTHON_PREFIX’
- The string ‘${prefix}’. This term may be used in future work that
- needs the contents of Python’s ‘sys.prefix’, but general consensus
- is to always use the value from ‘configure’.
-
‘PYTHON_EXEC_PREFIX’
- The string ‘${exec_prefix}’. This term may be used in future work
- that needs the contents of Python’s ‘sys.exec_prefix’, but general
- consensus is to always use the value from ‘configure’.
+ The value of Python’s ‘sys.prefix’ (resp. ‘sys.exec_prefix’)
+ variable. Sometimes the same as the standard ‘${prefix}’
+ (‘${exec_prefix}’), but differs on some platforms such as Mac OS x
+ (where Python is usually installed as a Framework). Can be set
+ explicitly with the ‘--with-python_prefix’
+ (‘--with-python_exec_prefix’) ‘configure’ option.
‘PYTHON_PLATFORM’
The canonical name used by Python to describe the operating system,
@@ -6643,9 +6656,9 @@ below).
This is a convenience variable that is defined as
‘$(pyexecdir)/$(PACKAGE)’.
- All of these directory variables have values that start with either
-‘${prefix}’ or ‘${exec_prefix}’ unexpanded. This works fine in
-‘Makefiles’, but it makes these variables hard to use in ‘configure’.
+ All of these directory variables have values that can start with
+either ‘${prefix}’ or ‘${exec_prefix}’, unexpanded. This works fine in
+‘Makefile’s, but it makes these variables hard to use in ‘configure’.
This is mandated by the GNU coding standards, so that the user can run
‘make prefix=/foo install’. The Autoconf manual has a section with more
details on this topic (*note Installation Directory Variables:
@@ -6727,10 +6740,10 @@ for each Texinfo file. Automake will treat any include in a Texinfo
file that matches ‘vers*.texi’ just as an automatically generated
version file.
- Sometimes an info file actually depends on more than one ‘.texi’
-file. For instance, in GNU Hello, ‘hello.texi’ includes the file
-‘fdl.texi’. You can tell Automake about these dependencies using the
-‘TEXI_TEXINFOS’ variable. Here is how GNU Hello does it:
+ Often an Info file depends on more than one ‘.texi’ file. For
+instance, in GNU Hello, ‘hello.texi’ includes the file ‘fdl.texi’. You
+can tell Automake about these dependencies using the ‘TEXI_TEXINFOS’
+variable. Here is how GNU Hello does it:
info_TEXINFOS = hello.texi
hello_TEXINFOS = fdl.texi
@@ -6888,22 +6901,3 @@ For instance:
notrans_dist_man3_MANS = bar.3
-
-File: automake.info, Node: Install, Next: Clean, Prev: Documentation, Up: Top
-
-12 What Gets Installed
-**********************
-
-Naturally, Automake handles the details of actually installing your
-program once it has been built. All files named by the various
-primaries are automatically installed in the appropriate places when the
-user runs ‘make install’.
-
-* Menu:
-
-* Basics of Installation:: What gets installed where
-* The Two Parts of Install:: Installing data and programs separately
-* Extending Installation:: Adding your own rules for installation
-* Staged Installs:: Installation in a temporary location
-* Install Rules for the User:: Useful additional rules
-
diff --git a/doc/automake.info-2 b/doc/automake.info-2
index 41552cc90..332bd6783 100644
--- a/doc/automake.info-2
+++ b/doc/automake.info-2
@@ -1,11 +1,11 @@
-This is automake.info, produced by makeinfo version 6.7 from
+This is automake.info, produced by makeinfo version 6.8 from
automake.texi.
-This manual is for GNU Automake (version 1.16.3, 19 November 2020), a
+This manual is for GNU Automake (version 1.16.4, 16 July 2021), a
program that creates GNU standards-compliant Makefiles from template
files.
- Copyright © 1995–2020 Free Software Foundation, Inc.
+ Copyright © 1995–2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -26,6 +26,25 @@ START-INFO-DIR-ENTRY
END-INFO-DIR-ENTRY

+File: automake.info, Node: Install, Next: Clean, Prev: Documentation, Up: Top
+
+12 What Gets Installed
+**********************
+
+Naturally, Automake handles the details of installing your program once
+it has been built. All files named by the various primaries are
+automatically installed in the appropriate places when the user runs
+‘make install’.
+
+* Menu:
+
+* Basics of Installation:: What gets installed where
+* The Two Parts of Install:: Installing data and programs separately
+* Extending Installation:: Adding your own rules for installation
+* Staged Installs:: Installation in a temporary location
+* Install Rules for the User:: Useful additional rules
+
+
File: automake.info, Node: Basics of Installation, Next: The Two Parts of Install, Up: Install
12.1 Basics of Installation
@@ -233,50 +252,71 @@ File: automake.info, Node: Basics of Distribution, Next: Fine-grained Distribu
===========================
The ‘dist’ rule in the generated ‘Makefile.in’ can be used to generate a
-gzipped ‘tar’ file and other flavors of archive for distribution. The
-file is named based on the ‘PACKAGE’ and ‘VERSION’ variables
+gzipped ‘tar’ file and/or other flavors of archives for distribution.
+The file is named based on the ‘PACKAGE’ and ‘VERSION’ variables
automatically defined by either the ‘AC_INIT’ invocation or by a
_deprecated_ two-arguments invocation of the ‘AM_INIT_AUTOMAKE’ macro
(see *note Public Macros:: for how these variables get their values,
from either defaults or explicit values—it’s slightly trickier than one
-would expect). More precisely the gzipped ‘tar’ file is named
+would expect). More precisely, the gzipped ‘tar’ file is named
‘${PACKAGE}-${VERSION}.tar.gz’.
- You can use the ‘make’ variable ‘GZIP_ENV’ to control how gzip is
-run. The default setting is ‘--best’.
-
You can set the environment variable ‘TAR’ to override the tar
-program used; it defaults to ‘tar’.
+program used; it defaults to ‘tar’. *Note The Types of Distributions::,
+for how to generate other kinds of archives.
For the most part, the files to distribute are automatically found by
-Automake: all source files are automatically included in a distribution,
-as are all ‘Makefile.am’ and ‘Makefile.in’ files. Automake also has a
-built-in list of commonly used files that are automatically included if
-they are found in the current directory (either physically, or as the
-target of a ‘Makefile.am’ rule); this list is printed by ‘automake
---help’. Note that some files in this list are actually distributed
-only if other certain conditions hold (for example, the ‘config.h.top’
-and ‘config.h.bot’ files are automatically distributed only if, e.g.,
-‘AC_CONFIG_HEADERS([config.h])’ is used in ‘configure.ac’). Also, files
-that are read by ‘configure’ (i.e. the source files corresponding to the
-files specified in various Autoconf macros such as ‘AC_CONFIG_FILES’ and
-siblings) are automatically distributed. Files included in a
-‘Makefile.am’ (using ‘include’) or in ‘configure.ac’ (using
-‘m4_include’), and helper scripts installed with ‘automake
---add-missing’ are also distributed.
-
- Still, sometimes there are files that must be distributed, but which
-are not covered in the automatic rules. These files should be listed in
-the ‘EXTRA_DIST’ variable. You can mention files from subdirectories in
-‘EXTRA_DIST’.
+Automake:
+
+ • All source files are automatically included in a distribution, as
+ are all ‘Makefile.am’ and ‘Makefile.in’ files.
+
+ • Files that are read by ‘configure’ are automatically distributed.
+ These are the source files as specified in various Autoconf macros
+ such as ‘AC_CONFIG_FILES’ and siblings.
+
+ • Files included in a ‘Makefile.am’ (using ‘include’) or in
+ ‘configure.ac’ (using ‘m4_include’).
+
+ • Automake has a built-in list of commonly used files automatically
+ included in the distribution if they are found in the current
+ directory (either physically, or as the target of a ‘Makefile.am’
+ rule). Some common examples: ‘ABOUT-GNU’, ‘COPYING’, ‘TODO’.
+
+ This list also includes helper scripts installed with ‘automake
+ --add-missing’. Some common examples: ‘compile’, ‘config.guess’,
+ ‘config.rpath’, ‘config.sub’, ‘texinfo.tex’.
+
+ • Automake has another built-in list of files automatically
+ distributed if they are found either with the plain name, or with
+ extension ‘.md’ (presumably MarkDown, though this not checked).
+ They are checked for in that order, so the plain name is preferred.
+ These are: ‘AUTHORS ChangeLog INSTALL NEWS README README-alpha
+ THANKS’.
+
+ • A final built-in list of files are those distributed only if other
+ certain conditions hold. For example, the files ‘config.h.top’ and
+ ‘config.h.bot’ are automatically distributed only if, e.g.,
+ ‘AC_CONFIG_HEADERS([config.h])’ is used in ‘configure.ac’).
+ ‘README-alpha’ is another such file, with ‘README-alpha.md’
+ distributed if that is what is available; *note Strictness::, for
+ its conditions for distribution.
+
+These three lists of files are given in their entirety in the output
+from ‘automake --help’.
+
+ Despite all this automatic inclusion, it is still common to have
+files to be distributed which are not found by the automatic rules. You
+should listed these files in the ‘EXTRA_DIST’ variable. You can mention
+files in subdirectories in ‘EXTRA_DIST’.
You can also mention a directory in ‘EXTRA_DIST’; in this case the
-entire directory will be recursively copied into the distribution.
-Please note that this will also copy _everything_ in the directory,
-including, e.g., Subversion’s ‘.svn’ private directories or CVS/RCS
-version control files; thus we recommend against using this feature
-as-is. However, you can use the ‘dist-hook’ feature to ameliorate the
-problem; *note The dist Hook::.
+entire directory will be recursively copied into the distribution. To
+emphasize, this copies _everything_ in the directory, including
+temporary editor files, intermediate build files, version control files,
+etc.; thus we recommend against using this feature as-is. However, you
+can use the ‘dist-hook’ feature to ameliorate the problem; *note The
+dist Hook::.
If you define ‘SUBDIRS’, Automake will recursively include the
subdirectories in the distribution. If ‘SUBDIRS’ is defined
@@ -323,17 +363,17 @@ files that get recursively included by specifying a directory in
EXTRA_DIST = doc
dist-hook:
chmod -R u+w $(distdir)/doc
- rm -rf `find $(distdir)/doc -type d -name .svn`
-
-Note that the ‘dist-hook’ recipe shouldn’t assume that the regular files
-in the distribution directory are writable; this might not be the case
-if one is packaging from a read-only source tree, or when a ‘make
-distcheck’ is being done. For similar reasons, the recipe shouldn’t
-assume that the subdirectories put into the distribution directory as an
-effect of having them listed in ‘EXTRA_DIST’ are writable. So, if the
-‘dist-hook’ recipe wants to modify the content of an existing file (or
-‘EXTRA_DIST’ subdirectory) in the distribution directory, it should
-explicitly to make it writable first:
+ rm -rf `find $(distdir)/doc -type d -name RCS`
+
+The ‘dist-hook’ recipe should not assume that the regular files in the
+distribution directory are writable; this might not be the case if one
+is packaging from a read-only source tree, or when a ‘make distcheck’ is
+being done. Similarly, the recipe should not assume that the
+subdirectories put into the distribution directory as a result of being
+listed in ‘EXTRA_DIST’ are writable. So, if the ‘dist-hook’ recipe
+wants to modify the content of an existing file (or ‘EXTRA_DIST’
+subdirectory) in the distribution directory, it should explicitly to
+make it writable first:
EXTRA_DIST = README doc
dist-hook:
@@ -348,15 +388,15 @@ explicitly to make it writable first:
files from the current directory before creating the tarball. If you
are at the top-level directory, then ‘distdir = $(PACKAGE)-$(VERSION)’.
When used from subdirectory named ‘foo/’, then ‘distdir =
-../$(PACKAGE)-$(VERSION)/foo’. ‘$(distdir)’ can be a relative or
-absolute path, do not assume any form.
+../$(PACKAGE)-$(VERSION)/foo’. ‘$(distdir)’ can be either a relative or
+absolute path; do not assume a particular form.
‘$(top_distdir)’ always points to the root directory of the
-distributed tree. At the top-level it’s equal to ‘$(distdir)’. In the
+distributed tree. At the top level it’s equal to ‘$(distdir)’. In the
‘foo/’ subdirectory ‘top_distdir = ../$(PACKAGE)-$(VERSION)’.
-‘$(top_distdir)’ too can be a relative or absolute path.
+‘$(top_distdir)’ can also be either a relative or absolute path.
- Note that when packages are nested using ‘AC_CONFIG_SUBDIRS’ (*note
+ When packages are nested using ‘AC_CONFIG_SUBDIRS’ (*note
Subpackages::), then ‘$(distdir)’ and ‘$(top_distdir)’ are relative to
the package where ‘make dist’ was run, not to any sub-packages involved.
@@ -520,35 +560,44 @@ distributions in various formats. Their targets are:
‘dist-gzip’
Generate a ‘gzip’ tar archive of the distribution. This is the
- only format enabled by default.
+ only format enabled by default. By default, this rule makes ‘gzip’
+ use a compression option of ‘--best’. To make it use a different
+ one, set the ‘GZIP_ENV’ environment variable. For example, ‘make
+ dist-gzip GZIP_ENV=-7’.
‘dist-bzip2’
Generate a ‘bzip2’ tar archive of the distribution. bzip2 archives
- are frequently smaller than gzipped archives. By default, this
- rule makes ‘bzip2’ use a compression option of ‘-9’. To make it
- use a different one, set the ‘BZIP2’ environment variable. For
- example, ‘make dist-bzip2 BZIP2=-7’.
+ are usually smaller than gzipped archives. By default, this rule
+ makes ‘bzip2’ use a compression option of ‘-9’. To make it use a
+ different one, set the ‘BZIP2’ environment variable.
‘dist-lzip’
Generate an ‘lzip’ tar archive of the distribution. ‘lzip’
- archives are frequently smaller than ‘bzip2’-compressed archives.
+ archives are usually smaller than ‘bzip2’-compressed archives. By
+ default, this rule makes ‘lzip’ use a compression option of ‘-9’.
+ To make it use a different one, set the ‘LZIP_OPT’ environment
+ variable.
‘dist-xz’
Generate an ‘xz’ tar archive of the distribution. ‘xz’ archives
- are frequently smaller than ‘bzip2’-compressed archives. By
- default, this rule makes ‘xz’ use a compression option of ‘-e’. To
- make it use a different one, set the ‘XZ_OPT’ environment variable.
- For example, run this command to use the default compression ratio,
- but with a progress indicator: ‘make dist-xz XZ_OPT=-ve’.
+ are usually smaller than ‘bzip2’-compressed archives. By default,
+ this rule makes ‘xz’ use a compression option of ‘-e’. To make it
+ use a different one, set the ‘XZ_OPT’ environment variable. For
+ example, run this command to use the default compression ratio, but
+ with a progress indicator: ‘make dist-xz XZ_OPT=-ve’.
‘dist-zip’
Generate a ‘zip’ archive of the distribution.
-‘dist-tarZ’
- Generate a tar archive of the distribution, compressed with the
- historical (and obsolescent) program ‘compress’. This option is
- deprecated, and it and the corresponding functionality will be
- removed altogether in Automake 2.0.
+‘dist-zstd’
+ Generate a ‘zstd’ tar archive of the distribution. By default,
+ this rule makes ‘zstd’ use a compression option of ‘-19’. To use a
+ different setting, set the ‘ZSTD_OPT’ environment variable. For
+ example, run this command to use the default compression ratio, but
+ with a progress indicator: ‘make dist-zstd ZSTD_OPT=-19v’.
+ However, note that for compatibility with ‘zstd’ itself, you may
+ instead set the ‘ZSTD_CLEVEL’ environment variable, in which case,
+ any ‘ZSTD_OPT’ setting is ignored.
‘dist-shar’
Generate a ‘shar’ archive of the distribution. This format archive
@@ -556,20 +605,16 @@ distributions in various formats. Their targets are:
corresponding functionality will be removed altogether in Automake
2.0.
-‘dist-zstd’
- Generate a ‘zstd’ tar archive of the distribution. By default,
- this rule makes ‘zstd’ use a compression option of ‘-19’. To make
- it use a different one, set the ‘ZSTD_OPT’ environment variable.
- For example, run this command to use the default compression ratio,
- but with a progress indicator: ‘make dist-zstd ZSTD_OPT=-19v’.
- However, note that for compatibility with zstd itself, you may
- instead set the ‘ZSTD_CLEVEL’ environment variable, in which case,
- any ‘ZSTD_OPT’ setting is ignored.
+‘dist-tarZ’
+ Generate a tar archive of the distribution, compressed with the
+ historical (and obsolescent) program ‘compress’. This option is
+ deprecated, and it and the corresponding functionality will be
+ removed altogether in Automake 2.0.
The rule ‘dist’ (and its historical synonym ‘dist-all’) will create
archives in all the enabled formats (*note List of Automake options::
for how to change this list). By default, only the ‘dist-gzip’ target
-is hooked to ‘dist’.
+is enabled by ‘dist’.

File: automake.info, Node: Tests, Next: Rebuilding, Prev: Dist, Up: Top
@@ -630,11 +675,11 @@ determine that such condition of behaviour does _not_ hold.
simply make no sense on a given system (for example, a test checking a
Windows-specific feature makes no sense on a GNU/Linux system). In this
case, accordingly to the definition above, the tests can neither be
-considered passed nor failed; instead, they are _skipped_- –i.e., they
-are not run, or their result is anyway ignored for what concerns the
-count of failures and successes. Skips are usually explicitly reported
-though, so that the user will be aware that not all of the testsuite has
-really run.
+considered passed nor failed; instead, they are _skipped_, that is, they
+are not run, or their result is in any case ignored for what concerns
+the count of failures and successes. Skips are usually explicitly
+reported though, so that the user will be aware that not all of the
+testsuite has been run.
It’s not uncommon, especially during early development stages, that
some tests fail for known reasons, and that the developer doesn’t want
@@ -860,9 +905,8 @@ freeing the ‘TESTS_ENVIRONMENT’ variable for the user (*note Parallel
Test Harness::).
Another, less serious limitation of the serial harness is that it
-doesn’t really distinguish between simple failures and hard errors; this
-is due to historical reasons only, and might be fixed in future Automake
-versions.
+doesn’t distinguish between simple failures and hard errors; this is for
+historical reasons, and might be fixed in future Automake versions.

File: automake.info, Node: Parallel Test Harness, Prev: Serial Test Harness, Up: Simple Tests
@@ -960,9 +1004,18 @@ several ways to limit the set of tests that are run:
env TESTS="foo.test bar.test" make -e check
- Note however that the command above will unconditionally overwrite
- the ‘test-suite.log’ file, thus clobbering the recorded results of
- any previous testsuite run. This might be undesirable for packages
+ If you’re using a recursive make setup, you’ll probably also need
+ to override ‘SUBDIRS’:
+
+ env TESTS="foo.test bar.test" make -e check SUBDIRS=
+
+ Otherwise, the test harness will descend into all subdirectories,
+ where the tests presumably do not exist, and thus fail. (Patch to
+ provide better behavior would be welcome.)
+
+ Another issue: the command above will unconditionally overwrite the
+ ‘test-suite.log’ file, thus clobbering the recorded results of any
+ previous testsuite run. This might be undesirable for packages
whose testsuite takes a long time to execute. Luckily, this
problem can easily be avoided by also overriding ‘TEST_SUITE_LOG’
at runtime; for example,
@@ -1145,8 +1198,8 @@ File: automake.info, Node: API for Custom Test Drivers, Prev: Declaring Custom
----------------------------------
Note that _the APIs described here are still highly experimental_, and
-will very likely undergo tightenings and likely also extensive changes
-in the future, to accommodate for new features or to satisfy additional
+will very likely undergo tightening and possibly extensive changes in
+the future, to accommodate for new features or to satisfy additional
portability requirements.
The main characteristic of these APIs is that they are designed to
@@ -1681,6 +1734,13 @@ inconvenience is that ‘autoconf’ will now be rerun each time the version
number is bumped, when only ‘configure’ had to be rerun in the previous
setup.
+ GNU Make, at least, has an option ‘--always-make’ which tells Make to
+consider that all targets are out of date. This interacts badly with
+Automake-generated Makefiles, which implement their own careful rules
+for when to regenerate Makefiles, as described above. The result is an
+endless loop, or other poor behavior. The only thing to do, as far as
+we know, is to refrain from using ‘--always-make’.
+

File: automake.info, Node: Options, Next: Miscellaneous, Prev: Rebuilding, Up: Top
@@ -1813,6 +1873,17 @@ File: automake.info, Node: List of Automake options, Prev: Options generalitie
Don’t emit any code related to ‘dist’ target. This is useful when
a package has its own method for making distributions.
+‘no-dist-built-sources’
+ Don’t build ‘BUILT_SOURCES’ as part of ‘dist’. This option can be
+ set if building the distribution only requires the source files,
+ and doesn’t compile anything as a side-effect. The default is for
+ ‘$(distdir)’ to depend on ‘$(BUILT_SOURCES)’ because it is common,
+ at least among GNU packages, to want to build the program to
+ generate man pages with ‘help2man’ (*note Errors with distclean::).
+ Admittedly the default behavior should perhaps be to omit the
+ dependency, but to preserve compatibility, we don’t want to change
+ it now.
+
‘no-dist-gzip’
Do not hook ‘dist-gzip’ to ‘dist’.
@@ -1891,7 +1962,7 @@ File: automake.info, Node: List of Automake options, Prev: Options generalitie
subdirectory of the build directory corresponding to the
subdirectory of the source file. For instance, if the source file
is ‘subdir/file.cxx’, then the output file would be
- ‘subdir/file.o’.
+ ‘subdir/file.o’. *Note Program and Library Variables::.
‘tar-v7’
‘tar-ustar’
@@ -1986,9 +2057,9 @@ Emacs under some circumstances.
If any C, C++ or Fortran 77 source code or headers are present, then
‘tags’ and ‘TAGS’ rules will be generated for the directory. All files
listed using the ‘_SOURCES’, ‘_HEADERS’, and ‘_LISP’ primaries will be
-used to generate tags. Note that generated source files that are not
-distributed must be declared in variables like ‘nodist_noinst_HEADERS’
-or ‘nodist_PROG_SOURCES’ or they will be ignored.
+used to generate tags. Generated source files that are not distributed
+must be declared in variables like ‘nodist_noinst_HEADERS’ or
+‘nodist_PROG_SOURCES’ or they will be ignored.
A ‘tags’ rule will be output at the topmost directory of a
multi-directory package. When run from this topmost directory, ‘make
@@ -1999,7 +2070,9 @@ files from subdirectories.
is defined. This variable is intended for use in directories that
contain taggable source that ‘etags’ does not understand. The user can
use the ‘ETAGSFLAGS’ to pass additional flags to ‘etags’;
-‘AM_ETAGSFLAGS’ is also available for use in ‘Makefile.am’.
+‘AM_ETAGSFLAGS’ is also available for use in ‘Makefile.am’. The
+variable ‘ETAGS’ is the name of the program to invoke (by default
+‘etags’).
Here is how Automake generates tags for its source, and for nodes in
its Texinfo file:
@@ -2318,7 +2391,7 @@ the easy detection of potentially important warning messages.

File: automake.info, Node: Tricks For Silencing Make, Next: Automake Silent Rules, Prev: Make verbosity, Up: Silencing Make
-21.2 Standard and generic ways to silence make
+21.2 Standard and generic ways to silence Make
==============================================
Here we describe some common idioms/tricks to obtain a quieter make
@@ -2372,7 +2445,7 @@ in this respect, providing more elaborate and flexible idioms.

File: automake.info, Node: Automake Silent Rules, Prev: Tricks For Silencing Make, Up: Silencing Make
-21.3 How Automake can help in silencing make
+21.3 How Automake can help in silencing Make
============================================
The tricks and idioms for silencing ‘make’ described in the previous
@@ -2412,7 +2485,7 @@ are disabled) and one with silent rules enabled:
mv -f .deps/func.Tpo .deps/func.Po
gcc -Wall -o foo main.o func.o
- Clean up, so that we we can rebuild everything from scratch.
+ Clean up, so that we can rebuild everything from scratch.
% make clean
test -z "foo" || rm -f foo
rm -f *.o
@@ -2467,9 +2540,9 @@ time. We think that this is a good policy, since it provides the casual
user with enough information to prepare a good bug report in case
anything breaks.
- Still, notwithstanding the rationales above, a developer who really
-wants to make silent rules enabled by default in his own package can do
-so by calling ‘AM_SILENT_RULES([yes])’ in ‘configure.ac’.
+ Still, notwithstanding the rationales above, developers who wants to
+make silent rules enabled by default in their own packages can do so by
+calling ‘AM_SILENT_RULES([yes])’ in ‘configure.ac’.
Users who prefer to have silent rules enabled by default can edit
their ‘config.site’ file to make the variable ‘enable_silent_rules’
@@ -2741,7 +2814,7 @@ they support VPATH builds (*note VPATH Builds::). Obviously if the
subpackage does not support VPATH builds the whole package will not
support VPATH builds. This in turns means that ‘make distcheck’ will
not work, because it relies on VPATH builds. Some people can live
-without this (actually, many Automake users have never heard of ‘make
+without this (indeed, many Automake users have never heard of ‘make
distcheck’). Other people may prefer to revamp the existing ‘Makefile’s
to support VPATH. Doing so does not necessarily require Automake; only
Autoconf is needed (*note Build Directories: (autoconf)Build
@@ -2755,14 +2828,14 @@ aforementioned ‘$(distdir)’ and ‘$(top_distdir)’ variables.
introduce the above required targets. For instance, one may want to
keep the third-party sources untouched to ease upgrades to new versions.
- Here are two other ideas. If GNU make is assumed, one possibility is
+ Here are two other ideas. If GNU Make is assumed, one possibility is
to add to that subdirectory a ‘GNUmakefile’ that defines the required
targets and includes the third-party ‘Makefile’. For this to work in
VPATH builds, ‘GNUmakefile’ must lie in the build directory; the easiest
way to do this is to write a ‘GNUmakefile.in’ instead, and have it
-processed with ‘AC_CONFIG_FILES’ from the outer package. For example if
-we assume ‘Makefile’ defines all targets except the documentation
-targets, and that the ‘check’ target is actually called ‘test’, we could
+processed with ‘AC_CONFIG_FILES’ from the outer package. For example,
+if we assume ‘Makefile’ defines all targets except the documentation
+targets, and that the real ‘check’ target is named ‘test’, we could
write ‘GNUmakefile’ (or ‘GNUmakefile.in’) like this:
# First, include the real Makefile
@@ -3118,11 +3191,10 @@ But, after all, CVS’s job is versioning, not distribution.
Allowing developers to use different versions of their tools can also
hide bugs during distributed development. Indeed, developers will be
using (hence testing) their own generated files, instead of the
-generated files that will be actually released. The developer who
-prepares the tarball might be using a version of the tool that produces
-bogus output (for instance a non-portable C file), something other
-developers could have noticed if they weren’t using their own versions
-of this tool.
+generated files that will be released. The developer who prepares the
+tarball might be using a version of the tool that produces bogus output
+(for instance a non-portable C file), something other developers could
+have noticed if they weren’t using their own versions of this tool.
Third-party Files
-----------------
@@ -3182,7 +3254,7 @@ rules" should be enabled or disabled. With
they are disabled by default. In the latter case, if you have
‘AM_MAINTAINER_MODE’ in ‘configure.ac’, and run ‘./configure && make’,
then ‘make’ will *never* attempt to rebuild ‘configure’, ‘Makefile.in’s,
-Lex or Yacc outputs, etc. I.e., this disables build rules for files
+Lex or Yacc outputs, etc. That is, this disables build rules for files
that are usually distributed and that users should normally not have to
update.
@@ -3254,7 +3326,7 @@ Developers are lazy. They would often like to use wildcards in
e.g., NetBSD ‘make’ will not expand globs such as ‘*’ in
prerequisites of a target.
- • Finally, it’s really hard to _forget_ to add a file to
+ • Finally, it’s quite hard to _forget_ to add a file to
‘Makefile.am’: files that are not listed in ‘Makefile.am’ are not
compiled or installed, so you can’t even test them.
@@ -3364,7 +3436,7 @@ VPATH Builds::), and then call ‘make distclean’. Files left in the
build directory after ‘make distclean’ has run are listed after this
error.
- This diagnostic really covers two kinds of errors:
+ This diagnostic covers two kinds of errors:
• files that are forgotten by distclean;
• distributed files that are erroneously rebuilt.
@@ -3487,19 +3559,19 @@ Compile Flag Variables
----------------------
This section attempts to answer all the above questions. We will mostly
-discuss ‘CPPFLAGS’ in our examples, but actually the answer holds for
-all the compile flags used in Automake: ‘CCASFLAGS’, ‘CFLAGS’,
-‘CPPFLAGS’, ‘CXXFLAGS’, ‘FCFLAGS’, ‘FFLAGS’, ‘GCJFLAGS’, ‘LDFLAGS’,
-‘LFLAGS’, ‘LIBTOOLFLAGS’, ‘OBJCFLAGS’, ‘OBJCXXFLAGS’, ‘RFLAGS’,
-‘UPCFLAGS’, and ‘YFLAGS’.
+discuss ‘CPPFLAGS’ in our examples, but the answer holds for all the
+compile flags used in Automake: ‘CCASFLAGS’, ‘CFLAGS’, ‘CPPFLAGS’,
+‘CXXFLAGS’, ‘FCFLAGS’, ‘FFLAGS’, ‘GCJFLAGS’, ‘LDFLAGS’, ‘LFLAGS’,
+‘LIBTOOLFLAGS’, ‘OBJCFLAGS’, ‘OBJCXXFLAGS’, ‘RFLAGS’, ‘UPCFLAGS’, and
+‘YFLAGS’.
‘CPPFLAGS’, ‘AM_CPPFLAGS’, and ‘mumble_CPPFLAGS’ are three variables
-that can be used to pass flags to the C preprocessor (actually these
-variables are also used for other languages like C++ or preprocessed
-Fortran). ‘CPPFLAGS’ is the user variable (*note User Variables::),
-‘AM_CPPFLAGS’ is the Automake variable, and ‘mumble_CPPFLAGS’ is the
-variable specific to the ‘mumble’ target (we call this a per-target
-variable, *note Program and Library Variables::).
+that can be used to pass flags to the C preprocessor ( these variables
+are also used for other languages like C++ or preprocessed Fortran).
+‘CPPFLAGS’ is the user variable (*note User Variables::), ‘AM_CPPFLAGS’
+is the Automake variable, and ‘mumble_CPPFLAGS’ is the variable specific
+to the ‘mumble’ target (we call this a per-target variable, *note
+Program and Library Variables::).
Automake always uses two of these variables when compiling C sources
files. When compiling an object file for the ‘mumble’ target, the first
@@ -3535,22 +3607,27 @@ and this flag would be propagated to the compile rules of all
It is also not uncommon to override a user variable at ‘make’-time.
Many installers do this with ‘prefix’, but this can be useful with
-compiler flags too. For instance, if, while debugging a C++ project,
-you need to disable optimization in one specific object file, you can
-run something like
+compiler flags too. For instance, while debugging a C++ project, if you
+need to disable optimization in one specific object file, you can run
+something like
rm file.o
make CXXFLAGS=-O0 file.o
make
The reason ‘$(CPPFLAGS)’ appears after ‘$(AM_CPPFLAGS)’ or
-‘$(mumble_CPPFLAGS)’ in the compile command is that users should always
-have the last say. It probably makes more sense if you think about it
-while looking at the ‘CXXFLAGS=-O0’ above, which should supersede any
-other switch from ‘AM_CXXFLAGS’ or ‘mumble_CXXFLAGS’ (and this of course
-replaces the previous value of ‘CXXFLAGS’).
-
- You should never redefine a user variable such as ‘CPPFLAGS’ in
+‘$(mumble_CPPFLAGS)’ in the compile command is that users should have
+the last say. In the example above, the desire is for the
+‘CXXFLAGS=-O0’ to supersede any other switch from ‘AM_CXXFLAGS’ or
+‘mumble_CXXFLAGS’.
+
+ It’s true that not all options to all programs can be overridden. So
+in general, users could conceivably want to place options at arbitrary
+places in the command line, but Automake does not support this. It
+would be difficult to make such generality comprehensible. Being able
+to specify the final options commonly suffices.
+
+ Thus, you should never redefine a user variable such as ‘CPPFLAGS’ in
‘Makefile.am’. Use ‘automake -Woverride’ to diagnose such mistakes.
Even something like
@@ -3569,8 +3646,8 @@ either, for the same reason. Occasionally you need to modify these
variables to perform a test, but you should reset their values
afterwards. In contrast, it is OK to modify the ‘AM_’ variables within
‘configure’ if you ‘AC_SUBST’ them, but it is rather rare that you need
-to do this, unless you really want to change the default definitions of
-the ‘AM_’ variables in all ‘Makefile’s.
+to do this, unless you want to change the default definitions of the
+‘AM_’ variables in all ‘Makefile’s.
What we recommend is that you define extra flags in separate
variables. For instance, you may write an Autoconf macro that computes
@@ -3605,8 +3682,8 @@ flag. Yet another reason to leave user variables to users.
Finally, we have avoided naming the variable of the example
‘LIBFOO_LDFLAGS’ (with an underscore) because that would cause Automake
-to think that this is actually a per-target variable (like
-‘mumble_LDFLAGS’) for some non-declared ‘LIBFOO’ target.
+to think that this is a per-target variable (like ‘mumble_LDFLAGS’) for
+some non-declared ‘LIBFOO’ target.
Other Variables
---------------
@@ -3614,11 +3691,11 @@ Other Variables
There are other variables in Automake that follow similar principles to
allow user options. For instance, Texinfo rules (*note Texinfo::) use
‘MAKEINFOFLAGS’ and ‘AM_MAKEINFOFLAGS’. Similarly, DejaGnu tests (*note
-DejaGnu Tests::) use ‘RUNTESTDEFAULTFLAGS’ and ‘AM_RUNTESTDEFAULTFLAGS’.
-The tags and ctags rules (*note Tags::) use ‘ETAGSFLAGS’,
-‘AM_ETAGSFLAGS’, ‘CTAGSFLAGS’, and ‘AM_CTAGSFLAGS’. Java rules (*note
-Java::) use ‘JAVACFLAGS’ and ‘AM_JAVACFLAGS’. None of these rules
-support per-target flags (yet).
+DejaGnu Tests::) use ‘RUNTESTFLAGS’ and ‘AM_RUNTESTFLAGS’. The tags and
+ctags rules (*note Tags::) use ‘ETAGSFLAGS’, ‘AM_ETAGSFLAGS’,
+‘CTAGSFLAGS’, and ‘AM_CTAGSFLAGS’. Java rules (*note Java::) use
+‘JAVACFLAGS’ and ‘AM_JAVACFLAGS’. None of these rules support
+per-target flags (yet).
To some extent, even ‘AM_MAKEFLAGS’ (*note Subdirectories::) obeys
this naming scheme. The slight difference is that ‘MAKEFLAGS’ is passed
@@ -3657,9 +3734,9 @@ built with both ‘-DEXIT_CODE=0’ _and_ ‘-DEXIT_CODE=1’. Therefore
‘automake’ outputs rules to build two different objects:
‘true-generic.o’ and ‘false-generic.o’.
- ‘automake’ doesn’t actually look whether source files are shared to
-decide if it must rename objects. It will just rename all objects of a
-target as soon as it sees per-target compilation flags used.
+ Automake doesn’t actually determine whether source files are shared
+to decide if it must rename objects. It just renames all objects of a
+target as soon as it sees that per-target compilation flags are used.
It’s OK to share object files when per-target compilation flags are
not used. For instance, ‘true’ and ‘false’ will both use ‘version.o’ in
@@ -3755,9 +3832,9 @@ to write a ‘Makefile’ rule that captures this one-to-two dependency.
data.c data.h: data.foo
foo data.foo
-What the above rule really says is that ‘data.c’ and ‘data.h’ each
-depend on ‘data.foo’, and can each be built by running ‘foo data.foo’.
-In other words it is equivalent to:
+What the above rule says is that ‘data.c’ and ‘data.h’ each depend on
+‘data.foo’, and can each be built by running ‘foo data.foo’. In other
+words it is equivalent to:
# We do not want this.
data.c: data.foo
@@ -3870,10 +3947,10 @@ do not know in which order these files are created. Suppose that
‘data.h’ is created before ‘data.c’. Then we have a weird situation.
The next time ‘make’ is run, ‘data.h’ will appear older than ‘data.c’,
the second rule will be triggered, a shell will be started to execute
-the ‘if...fi’ command, but actually it will just execute the ‘then’
-branch, that is: nothing. In other words, because the witness we
-selected is not the first file created by ‘foo’, ‘make’ will start a
-shell to do nothing each time it is run.
+the ‘if...fi’ command, but it will just execute the ‘then’ branch, that
+is: nothing. In other words, because the witness we selected is not the
+first file created by ‘foo’, ‘make’ will start a shell to do nothing
+each time it is run.
A simple riposte is to fix the timestamps when this happens.
@@ -4044,11 +4121,11 @@ File: automake.info, Node: Hard-Coded Install Paths, Next: Debugging Make Rule
These two setups share their symptoms: ‘make distcheck’ fails because
they are installing files to hard-coded paths. In the latter case the
-path is not really hard-coded in the package, but we can consider it to
-be hard-coded in the system (or in whichever tool that supplies the
-path). As long as the path does not use any of the standard directory
-variables (‘$(prefix)’, ‘$(bindir)’, ‘$(datadir)’, etc.), the effect
-will be the same: user-installations are impossible.
+path is not hard-coded in the package, but we can consider it to be
+hard-coded in the system (or in whichever tool that supplies the path).
+As long as the path does not use any of the standard directory variables
+(‘$(prefix)’, ‘$(bindir)’, ‘$(datadir)’, etc.), the effect will be the
+same: user-installations are impossible.
As a (non-root) user who wants to install a package, you usually have
no right to install anything in ‘/usr’ or ‘/usr/local’. So you do
@@ -4088,8 +4165,8 @@ where to install the library, it will answer something like this:
non-root users will not be able to install the package; hence distcheck
fails.
- Let’s do better. The ‘sysconfig.get_python_lib()’ function actually
-accepts a third argument that will replace Python’s installation prefix.
+ Let’s do better. The ‘sysconfig.get_python_lib()’ function accepts a
+third argument that will replace Python’s installation prefix.
% python -c 'from distutils import sysconfig;
print sysconfig.get_python_lib(1,0,"${exec_prefix}")'
@@ -4128,14 +4205,14 @@ here is how ‘AM_PATH_LISPDIR’ (*note Emacs Lisp::) computes
}'
conftest.out`
- I.e., it just picks the first directory that looks like
+ That is, it just picks the first directory that looks like
‘*/lib/*emacs/site-lisp’ or ‘*/share/*emacs/site-lisp’ in the search
path of emacs, and then substitutes ‘${libdir}’ or ‘${datadir}’
appropriately.
The emacs case looks complicated because it processes a list and
expects two possible layouts; otherwise it’s easy, and the benefits for
-non-root users are really worth the extra ‘sed’ invocation.
+non-root users are worth the extra ‘sed’ invocation.

File: automake.info, Node: Debugging Make Rules, Next: Reporting Bugs, Prev: Hard-Coded Install Paths, Up: FAQ
@@ -4152,23 +4229,26 @@ debugging makefiles generated by ‘automake’ effectively:
• If less verbose output has been enabled in the package with the use
of silent rules (*note Automake Silent Rules::), you can use ‘make
V=1’ to see the commands being executed.
+
• ‘make -n’ can help show what would be done without actually doing
- it. Note however, that this will _still execute_ commands prefixed
- with ‘+’, and, when using GNU ‘make’, commands that contain the
- strings ‘$(MAKE)’ or ‘${MAKE}’ (*note (make)Instead of
- Execution::). Typically, this is helpful to show what recursive
- rules would do, but it means that, in your own rules, you should
- not mix such recursion with actions that change any files.(1)
- Furthermore, note that GNU ‘make’ will update prerequisites for the
- ‘Makefile’ file itself even with ‘-n’ (*note (make)Remaking
- Makefiles::).
+ it. However, this _still executes_ commands prefixed with ‘+’,
+ and, when using GNU ‘make’, commands that contain the strings
+ ‘$(MAKE)’ or ‘${MAKE}’ (*note (make)Instead of Execution::).
+ Typically, this is helpful to show what recursive rules would do,
+ but it means that, in your own rules, you should not mix such
+ recursion with actions that change any files.(1) Furthermore, note
+ that GNU ‘make’ will update prerequisites for the ‘Makefile’ file
+ itself even with ‘-n’ (*note (make)Remaking Makefiles::).
+
• ‘make SHELL="/bin/bash -vx"’ can help debug complex rules. *Note
(autoconf)The Make Macro SHELL::, for some portability quirks
associated with this construct.
+
• ‘echo 'print: ; @echo "$(VAR)"' | make -f Makefile -f - print’ can
be handy to examine the expanded value of variables. You may need
to use a target other than ‘print’ if that is already used or a
file with that name exists.
+
• <http://bashdb.sourceforge.net/remake/> provides a modified GNU
‘make’ command called ‘remake’ that copes with complex GNU
‘make’-specific Makefiles and allows tracing execution, examining
@@ -4186,37 +4266,34 @@ File: automake.info, Node: Reporting Bugs, Prev: Debugging Make Rules, Up: FA
26.12 Reporting Bugs
====================
-Most nontrivial software has bugs. Automake is no exception. Although
-we cannot promise we can or will fix a bug, and we might not even agree
-that it is a bug, we want to hear about problems you encounter. Often
-we agree they are bugs and want to fix them.
-
- To make it possible for us to fix a bug, please report it. In order
-to do so effectively, it helps to know when and how to do it.
+Most nontrivial software has bugs. Automake is no exception. We cannot
+promise we can or will fix a bug, and we might not even agree that it is
+a bug, but we want to hear about problems you encounter. Often we agree
+they are bugs and want to fix them.
- Before reporting a bug, it is a good idea to see if it is already
-known. You can look at the GNU Bug Tracker (https://debbugs.gnu.org/)
-and the bug-automake mailing list archives
+ So, to make it possible for us to fix a bug, please report it. If
+you can, though, it is helpful if you check if it is already known. You
+can look at the GNU Bug Tracker (https://debbugs.gnu.org/) and the
+bug-automake mailing list archives
(https://lists.gnu.org/archive/html/bug-automake/) for previous bug
-reports. We previously used a Gnats database for bug tracking, but it
-is no longer online.
+reports. (We previously used a Gnats database for bug tracking, but it
+is no longer online.)
- If the bug is not already known, it should be reported. It is very
-important to report bugs in a way that is useful and efficient. For
-this, please familiarize yourself with How to Report Bugs Effectively
+ If the bug is not already known, it should be reported. To report
+bugs in a way that is useful and efficient, please read How to Report
+Bugs Effectively
(https://www.chiark.greenend.org.uk/~sgtatham/bugs.html) and How to Ask
Questions the Smart Way
-(http://catb.org/~esr/faqs/smart-questions.html). This helps you and
-developers to save time, which can then be spent on fixing more bugs and
-implementing more features.
+(http://catb.org/~esr/faqs/smart-questions.html). Good bug reports save
+time for everyone.
For a bug report, a feature request or other suggestions, please send
email to <bug-automake@gnu.org>. This will then open a new bug in the
bug tracker (https://debbugs.gnu.org/automake). Be sure to include the
-versions of Autoconf and Automake that you use. Ideally, post a minimal
-‘Makefile.am’ and ‘configure.ac’ that reproduces the problem you
-encounter. If you have encountered test suite failures, please attach
-the ‘test-suite.log’ file.
+versions of Autoconf and Automake that you use and the kind of system
+you’re on. Ideally, post a minimal ‘Makefile.am’ and ‘configure.ac’
+that reproduces the problem you encounter. If you have encountered test
+suite failures, please attach the ‘test-suite.log’ file.

File: automake.info, Node: Copying This Manual, Next: Indices, Prev: FAQ, Up: Top
@@ -4236,7 +4313,7 @@ A.1 GNU Free Documentation License
Version 1.3, 3 November 2008
- Copyright © 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ Copyright © 2000–2021 Free Software Foundation, Inc.
<https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
@@ -4738,53 +4815,56 @@ B.1 Macro Index
* AC_CONFIG_AUX_DIR: Optional. (line 19)
* AC_CONFIG_AUX_DIR <1>: Subpackages. (line 6)
* AC_CONFIG_FILES: Requirements. (line 15)
-* AC_CONFIG_HEADERS: Optional. (line 44)
-* AC_CONFIG_LIBOBJ_DIR: Optional. (line 40)
+* AC_CONFIG_FILES <1>: Basics of Distribution.
+ (line 26)
+* AC_CONFIG_HEADERS: Optional. (line 50)
+* AC_CONFIG_LIBOBJ_DIR: Optional. (line 46)
* AC_CONFIG_LIBOBJ_DIR <1>: LIBOBJS. (line 51)
-* AC_CONFIG_LINKS: Optional. (line 55)
+* AC_CONFIG_LINKS: Optional. (line 62)
* AC_CONFIG_SUBDIRS: Subpackages. (line 6)
+* AC_CONFIG_SUBDIRS <1>: The dist Hook. (line 49)
* AC_DEFUN: Extending aclocal. (line 36)
-* AC_F77_LIBRARY_LDFLAGS: Optional. (line 101)
-* AC_FC_SRCEXT: Optional. (line 107)
+* AC_F77_LIBRARY_LDFLAGS: Optional. (line 108)
+* AC_FC_SRCEXT: Optional. (line 114)
* AC_INIT: Public Macros. (line 15)
-* AC_LIBOBJ: Optional. (line 65)
+* AC_LIBOBJ: Optional. (line 72)
* AC_LIBOBJ <1>: LTLIBOBJS. (line 6)
* AC_LIBOBJ <2>: LIBOBJS. (line 11)
-* AC_LIBSOURCE: Optional. (line 66)
+* AC_LIBSOURCE: Optional. (line 73)
* AC_LIBSOURCE <1>: LIBOBJS. (line 17)
-* AC_LIBSOURCES: Optional. (line 67)
+* AC_LIBSOURCES: Optional. (line 74)
* AC_OUTPUT: Requirements. (line 15)
* AC_PREREQ: Extending aclocal. (line 36)
-* AC_PROG_CXX: Optional. (line 85)
-* AC_PROG_F77: Optional. (line 97)
-* AC_PROG_FC: Optional. (line 112)
+* AC_PROG_CXX: Optional. (line 92)
+* AC_PROG_F77: Optional. (line 104)
+* AC_PROG_FC: Optional. (line 119)
* AC_PROG_LEX: Public Macros. (line 94)
-* AC_PROG_LEX <1>: Optional. (line 127)
-* AC_PROG_LIBTOOL: Optional. (line 117)
-* AC_PROG_OBJC: Optional. (line 89)
-* AC_PROG_OBJCXX: Optional. (line 93)
-* AC_PROG_RANLIB: Optional. (line 81)
-* AC_PROG_YACC: Optional. (line 121)
-* AC_REQUIRE_AUX_FILE: Optional. (line 131)
-* AC_SUBST: Optional. (line 139)
-* AM_CONDITIONAL: Optional. (line 152)
+* AC_PROG_LEX <1>: Optional. (line 134)
+* AC_PROG_LIBTOOL: Optional. (line 124)
+* AC_PROG_OBJC: Optional. (line 96)
+* AC_PROG_OBJCXX: Optional. (line 100)
+* AC_PROG_RANLIB: Optional. (line 88)
+* AC_PROG_YACC: Optional. (line 128)
+* AC_REQUIRE_AUX_FILE: Optional. (line 138)
+* AC_SUBST: Optional. (line 146)
+* AM_CONDITIONAL: Optional. (line 159)
* AM_CONDITIONAL <1>: Usage of Conditionals.
(line 6)
* AM_CONDITIONAL <2>: Usage of Conditionals.
(line 9)
-* AM_COND_IF: Optional. (line 155)
+* AM_COND_IF: Optional. (line 162)
* AM_COND_IF <1>: Usage of Conditionals.
(line 66)
* AM_COND_IF <2>: Usage of Conditionals.
(line 70)
* AM_DEP_TRACK: Private Macros. (line 14)
-* AM_GNU_GETTEXT: Optional. (line 161)
-* AM_GNU_GETTEXT_INTL_SUBDIR: Optional. (line 167)
+* AM_GNU_GETTEXT: Optional. (line 168)
+* AM_GNU_GETTEXT_INTL_SUBDIR: Optional. (line 174)
* AM_INIT_AUTOMAKE: Requirements. (line 6)
* AM_INIT_AUTOMAKE <1>: Public Macros. (line 7)
* AM_MAINTAINER_MODE: Rebuilding. (line 9)
* AM_MAINTAINER_MODE <1>: maintainer-mode. (line 38)
-* AM_MAINTAINER_MODE([DEFAULT-MODE]): Optional. (line 172)
+* AM_MAINTAINER_MODE([DEFAULT-MODE]): Optional. (line 179)
* AM_MAKE_INCLUDE: Private Macros. (line 20)
* AM_MISSING_PROG: Public Macros. (line 110)
* AM_OUTPUT_DEPENDENCY_COMMANDS: Private Macros. (line 15)
@@ -4802,11 +4882,11 @@ B.1 Macro Index
* AM_SANITY_CHECK: Private Macros. (line 30)
* AM_SET_DEPDIR: Private Macros. (line 13)
* AM_SILENT_RULES: Public Macros. (line 118)
-* AM_SUBST_NOTMAKE(VAR): Optional. (line 180)
+* AM_SUBST_NOTMAKE(VAR): Optional. (line 187)
* AM_WITH_DMALLOC: Public Macros. (line 122)
* m4_include: Basics of Distribution.
- (line 22)
-* m4_include <1>: Optional. (line 190)
+ (line 30)
+* m4_include <1>: Optional. (line 197)

File: automake.info, Node: Variable Index, Next: General Index, Prev: Macro Index, Up: Indices
@@ -4859,7 +4939,7 @@ B.2 Variable Index
(line 120)
* AM_DISTCHECK_CONFIGURE_FLAGS: Checking the Distribution.
(line 30)
-* AM_ETAGSFLAGS: Tags. (line 25)
+* AM_ETAGSFLAGS: Tags. (line 27)
* AM_EXT_LOG_DRIVER_FLAGS: Declaring Custom Test Drivers.
(line 6)
* AM_EXT_LOG_FLAGS: Parallel Test Harness.
@@ -4869,7 +4949,7 @@ B.2 Variable Index
* AM_GCJFLAGS: Java Support with gcj.
(line 26)
* AM_INSTALLCHECK_STD_OPTIONS_EXEMPT: List of Automake options.
- (line 139)
+ (line 150)
* AM_JAVACFLAGS: Java. (line 44)
* AM_LDFLAGS: Linking. (line 10)
* AM_LDFLAGS <1>: Program Variables. (line 59)
@@ -4917,8 +4997,10 @@ B.2 Variable Index
* bin_SCRIPTS: Scripts. (line 18)
* build_triplet: Optional. (line 14)
* BUILT_SOURCES: Sources. (line 27)
+* BUILT_SOURCES, and dist target: List of Automake options.
+ (line 81)
* BZIP2: The Types of Distributions.
- (line 13)
+ (line 17)
* CC: Program Variables. (line 12)
* CCAS: Public Macros. (line 82)
* CCAS <1>: Assembly Support. (line 10)
@@ -4938,6 +5020,12 @@ B.2 Variable Index
* CONFIG_STATUS_DEPENDENCIES: Rebuilding. (line 12)
* CPPFLAGS: Program Variables. (line 12)
* CPPFLAGS <1>: Assembly Support. (line 10)
+* CSCOPE: Tags. (line 57)
+* CSCOPEFLAGS: Tags. (line 57)
+* CSCOPE_ARGS: Tags. (line 57)
+* CTAGS: Tags. (line 43)
+* CTAGSFLAGS: Tags. (line 43)
+* CTAGS_ARGS: Tags. (line 43)
* CXX: C++ Support. (line 16)
* CXXCOMPILE: C++ Support. (line 25)
* CXXFLAGS: C++ Support. (line 19)
@@ -4975,21 +5063,22 @@ B.2 Variable Index
* DIST_SUBDIRS: Subdirectories with AM_CONDITIONAL.
(line 25)
* DIST_SUBDIRS <1>: Basics of Distribution.
- (line 52)
+ (line 73)
* DVIPS: Texinfo. (line 141)
* EMACS: Public Macros. (line 60)
* EMPTY_AUTOMAKE_TARGETS: Third-Party Makefiles.
(line 88)
-* ETAGSFLAGS: Tags. (line 25)
-* ETAGS_ARGS: Tags. (line 25)
+* ETAGS: Tags. (line 27)
+* ETAGSFLAGS: Tags. (line 27)
+* ETAGS_ARGS: Tags. (line 27)
* EXPECT: DejaGnu Tests. (line 19)
* EXTRA_DIST: Basics of Distribution.
- (line 39)
+ (line 60)
* EXTRA_maude_DEPENDENCIES: Linking. (line 41)
* EXTRA_maude_DEPENDENCIES <1>: Program and Library Variables.
- (line 119)
+ (line 129)
* EXTRA_maude_SOURCES: Program and Library Variables.
- (line 53)
+ (line 60)
* EXTRA_PROGRAMS: Conditional Programs.
(line 15)
* EXT_LOG_COMPILE: Parallel Test Harness.
@@ -5022,9 +5111,9 @@ B.2 Variable Index
(line 16)
* GCJLINK: How the Linker is Chosen.
(line 10)
-* GTAGS_ARGS: Tags. (line 60)
-* GZIP_ENV: Basics of Distribution.
- (line 16)
+* GTAGS_ARGS: Tags. (line 62)
+* GZIP_ENV: The Types of Distributions.
+ (line 10)
* HEADERS: Uniform. (line 101)
* host_triplet: Optional. (line 14)
* INCLUDES: Program Variables. (line 44)
@@ -5039,7 +5128,7 @@ B.2 Variable Index
* LFLAGS: Yacc and Lex. (line 60)
* libexec_PROGRAMS: Program Sources. (line 6)
* libexec_SCRIPTS: Scripts. (line 18)
-* LIBOBJS: Optional. (line 68)
+* LIBOBJS: Optional. (line 75)
* LIBOBJS <1>: LTLIBOBJS. (line 6)
* LIBOBJS <2>: LIBOBJS. (line 6)
* LIBRARIES: Uniform. (line 101)
@@ -5069,6 +5158,8 @@ B.2 Variable Index
* LTLIBOBJS: LTLIBOBJS. (line 6)
* LTLIBOBJS <1>: LIBOBJS. (line 6)
* LTLIBRARIES: Uniform. (line 101)
+* LZIP_OPT: The Types of Distributions.
+ (line 23)
* MAINTAINERCLEANFILES: Clean. (line 13)
* MAKE: Subdirectories. (line 29)
* MAKEINFO: Texinfo. (line 99)
@@ -5077,52 +5168,52 @@ B.2 Variable Index
* MANS: Uniform. (line 101)
* man_MANS: Man Pages. (line 6)
* maude_AR: Program and Library Variables.
- (line 68)
+ (line 76)
* maude_CCASFLAGS: Program and Library Variables.
- (line 170)
+ (line 183)
* maude_CFLAGS: Program and Library Variables.
- (line 171)
+ (line 184)
* maude_CPPFLAGS: Program and Library Variables.
- (line 172)
+ (line 185)
* maude_CXXFLAGS: Program and Library Variables.
- (line 173)
+ (line 186)
* maude_DEPENDENCIES: Linking. (line 41)
* maude_DEPENDENCIES <1>: Program and Library Variables.
- (line 118)
+ (line 128)
* maude_FFLAGS: Program and Library Variables.
- (line 174)
+ (line 187)
* maude_GCJFLAGS: Program and Library Variables.
- (line 175)
+ (line 188)
* maude_LDADD: Linking. (line 17)
* maude_LDADD <1>: Program and Library Variables.
- (line 86)
+ (line 94)
* maude_LDFLAGS: Linking. (line 37)
* maude_LDFLAGS <1>: Program and Library Variables.
- (line 106)
+ (line 114)
* maude_LFLAGS: Program and Library Variables.
- (line 176)
+ (line 189)
* maude_LIBADD: A Library. (line 26)
* maude_LIBADD <1>: Program and Library Variables.
- (line 78)
+ (line 86)
* maude_LIBTOOLFLAGS: Libtool Flags. (line 6)
* maude_LIBTOOLFLAGS <1>: Program and Library Variables.
- (line 111)
+ (line 121)
* maude_LINK: Program and Library Variables.
- (line 154)
+ (line 164)
* maude_OBJCFLAGS: Program and Library Variables.
- (line 177)
+ (line 190)
* maude_OBJCXXFLAGS: Program and Library Variables.
- (line 178)
+ (line 191)
* maude_RFLAGS: Program and Library Variables.
- (line 179)
+ (line 192)
* maude_SHORTNAME: Program and Library Variables.
- (line 210)
+ (line 223)
* maude_SOURCES: Program and Library Variables.
(line 18)
* maude_UPCFLAGS: Program and Library Variables.
- (line 180)
+ (line 193)
* maude_YFLAGS: Program and Library Variables.
- (line 181)
+ (line 194)
* MISSING: Public Macros. (line 110)
* MKDIR_P: Obsolete Macros. (line 14)
* mkdir_p: Obsolete Macros. (line 14)
@@ -5171,20 +5262,20 @@ B.2 Variable Index
* pkglibexec_SCRIPTS: Scripts. (line 18)
* pkglib_LIBRARIES: A Library. (line 6)
* pkglib_LTLIBRARIES: Libtool Libraries. (line 6)
-* pkgpyexecdir: Python. (line 105)
-* pkgpythondir: Python. (line 91)
+* pkgpyexecdir: Python. (line 104)
+* pkgpythondir: Python. (line 90)
* PROGRAMS: Uniform. (line 17)
* PROGRAMS <1>: Uniform. (line 101)
-* pyexecdir: Python. (line 96)
+* pyexecdir: Python. (line 95)
* PYTHON: Uniform. (line 101)
* PYTHON <1>: Python. (line 56)
-* pythondir: Python. (line 87)
-* PYTHON_EXEC_PREFIX: Python. (line 77)
-* PYTHON_PLATFORM: Python. (line 82)
+* pythondir: Python. (line 86)
+* PYTHON_EXEC_PREFIX: Python. (line 73)
+* PYTHON_PLATFORM: Python. (line 81)
* PYTHON_PREFIX: Python. (line 72)
* PYTHON_VERSION: Python. (line 68)
* RECHECK_LOGS: Parallel Test Harness.
- (line 118)
+ (line 127)
* RFLAGS: Fortran 77 Support. (line 25)
* RUNTEST: DejaGnu Tests. (line 19)
* RUNTESTDEFAULTFLAGS: DejaGnu Tests. (line 14)
@@ -5198,12 +5289,16 @@ B.2 Variable Index
* SOURCES <1>: Default _SOURCES. (line 6)
* SUBDIRS: Subdirectories. (line 8)
* SUBDIRS <1>: Basics of Distribution.
- (line 52)
+ (line 73)
* SUFFIXES: Suffixes. (line 6)
+* sys.exec_prefix Python variable: Python. (line 74)
+* sys.platform Python variable: Python. (line 82)
+* sys.prefix Python variable: Python. (line 74)
+* sys.version_info Python variable: Python. (line 69)
* sysconf_DATA: Data. (line 9)
-* TAGS_DEPENDENCIES: Tags. (line 35)
+* TAGS_DEPENDENCIES: Tags. (line 37)
* TAR: Basics of Distribution.
- (line 19)
+ (line 16)
* target_triplet: Optional. (line 14)
* TESTS: Scripts-based Testsuites.
(line 104)
@@ -5250,13 +5345,13 @@ B.2 Variable Index
* XFAIL_TESTS: Scripts-based Testsuites.
(line 32)
* XZ_OPT: The Types of Distributions.
- (line 24)
-* YACC: Optional. (line 122)
+ (line 30)
+* YACC: Optional. (line 129)
* YFLAGS: Yacc and Lex. (line 37)
* ZSTD_CLEVEL: The Types of Distributions.
- (line 47)
+ (line 41)
* ZSTD_OPT: The Types of Distributions.
- (line 47)
+ (line 41)

File: automake.info, Node: General Index, Prev: Variable Index, Up: Indices
@@ -5272,19 +5367,20 @@ B.3 General Index
* $(LIBOBJS) and empty libraries: LIBOBJS. (line 72)
* +=: General Operation. (line 24)
* --add-missing: automake Invocation. (line 41)
+* --always-make GNU Make option: Rebuilding. (line 77)
* --automake-acdir: aclocal Options. (line 9)
* --build=BUILD: Cross-Compilation. (line 14)
* --copy: automake Invocation. (line 75)
* --diff: aclocal Options. (line 22)
* --disable-dependency-tracking: Dependency Tracking. (line 33)
-* --disable-maintainer-mode: Optional. (line 173)
+* --disable-maintainer-mode: Optional. (line 180)
* --disable-silent-rules: Automake Silent Rules.
(line 85)
* --dry-run: aclocal Options. (line 27)
* --enable-debug, example: Usage of Conditionals.
(line 21)
* --enable-dependency-tracking: Dependency Tracking. (line 43)
-* --enable-maintainer-mode: Optional. (line 173)
+* --enable-maintainer-mode: Optional. (line 180)
* --enable-silent-rules: Automake Silent Rules.
(line 85)
* --force: aclocal Options. (line 49)
@@ -5298,7 +5394,7 @@ B.3 General Index
* --help: automake Invocation. (line 98)
* --help <1>: aclocal Options. (line 31)
* --help check: List of Automake options.
- (line 133)
+ (line 144)
* --help=recursive: Nested Packages. (line 30)
* --host=HOST: Cross-Compilation. (line 16)
* --include-deps: automake Invocation. (line 106)
@@ -5321,10 +5417,12 @@ B.3 General Index
* --version: automake Invocation. (line 129)
* --version <1>: aclocal Options. (line 76)
* --version check: List of Automake options.
- (line 133)
+ (line 144)
* --warnings: automake Invocation. (line 133)
* --warnings <1>: aclocal Options. (line 80)
* --with-dmalloc: Public Macros. (line 122)
+* --with-python_exec_prefix: Python. (line 74)
+* --with-python_prefix: Python. (line 74)
* -a: automake Invocation. (line 41)
* -c: automake Invocation. (line 74)
* -f: automake Invocation. (line 79)
@@ -5345,6 +5443,7 @@ B.3 General Index
* .la suffix, defined: Libtool Concept. (line 6)
* .log files: Parallel Test Harness.
(line 12)
+* .pyc, .pyo files: Python. (line 15)
* .trs files: Parallel Test Harness.
(line 12)
* :copy-in-global-log:: Log files generation and test results recording.
@@ -5468,9 +5567,11 @@ B.3 General Index
* Binary package: DESTDIR. (line 22)
* bootstrap and autoreconf: Error required file ltmain.sh not found.
(line 6)
-* Bugs, reporting: Introduction. (line 30)
+* Bugs, reporting: Reporting Bugs. (line 6)
* build tree and source tree: VPATH Builds. (line 6)
* BUILT_SOURCES, defined: Sources. (line 27)
+* bzip2: The Types of Distributions.
+ (line 17)
* C++ support: C++ Support. (line 6)
* canonicalizing Automake variables: Canonicalization. (line 6)
* CCASFLAGS and AM_CCASFLAGS: Flag Variables Ordering.
@@ -5502,6 +5603,8 @@ B.3 General Index
* Compile Flag Variables: Flag Variables Ordering.
(line 20)
* Complete example: Complete. (line 6)
+* compress: The Types of Distributions.
+ (line 57)
* Conditional example, --enable-debug: Usage of Conditionals.
(line 21)
* conditional libtool libraries: Conditional Libtool Libraries.
@@ -5536,7 +5639,7 @@ B.3 General Index
* cross-compilation: Cross-Compilation. (line 6)
* cross-compilation example: Cross-Compilation. (line 25)
* CVS and generated files: CVS. (line 50)
-* CVS and third-party files: CVS. (line 168)
+* CVS and third-party files: CVS. (line 167)
* CVS and timestamps: CVS. (line 29)
* CXXFLAGS and AM_CXXFLAGS: Flag Variables Ordering.
(line 20)
@@ -5568,30 +5671,32 @@ B.3 General Index
* dist: Standard Targets. (line 35)
* dist <1>: Basics of Distribution.
(line 6)
+* dist-all: The Types of Distributions.
+ (line 62)
* dist-bzip2: The Types of Distributions.
- (line 18)
+ (line 17)
* dist-bzip2 <1>: List of Automake options.
(line 23)
* dist-bzip2 <2>: List of Automake options.
(line 23)
* dist-gzip: The Types of Distributions.
- (line 11)
+ (line 10)
* dist-hook: The dist Hook. (line 6)
* dist-hook <1>: Extending. (line 66)
* dist-lzip: The Types of Distributions.
- (line 22)
+ (line 23)
* dist-lzip <1>: List of Automake options.
(line 26)
* dist-lzip <2>: List of Automake options.
(line 26)
* dist-shar: The Types of Distributions.
- (line 45)
+ (line 51)
* dist-shar <1>: List of Automake options.
(line 40)
* dist-shar <2>: List of Automake options.
(line 38)
* dist-tarZ: The Types of Distributions.
- (line 39)
+ (line 57)
* dist-tarZ <1>: List of Automake options.
(line 45)
* dist-tarZ <2>: List of Automake options.
@@ -5603,13 +5708,13 @@ B.3 General Index
* dist-xz <2>: List of Automake options.
(line 29)
* dist-zip: The Types of Distributions.
- (line 33)
+ (line 37)
* dist-zip <1>: List of Automake options.
(line 32)
* dist-zip <2>: List of Automake options.
(line 32)
* dist-zstd: The Types of Distributions.
- (line 55)
+ (line 41)
* dist-zstd <1>: List of Automake options.
(line 35)
* dist-zstd <2>: List of Automake options.
@@ -5653,7 +5758,6 @@ B.3 General Index
* dvi <2>: Extending. (line 41)
* DVI output using Texinfo: Texinfo. (line 6)
* dvi-local: Extending. (line 41)
-* E-mail, bug reports: Introduction. (line 30)
* EDITION Texinfo flag: Texinfo. (line 35)
* else: Usage of Conditionals.
(line 36)
@@ -5744,35 +5848,39 @@ B.3 General Index
* GNU Build System, use cases: Use Cases. (line 6)
* GNU Coding Standards: GNU Build System. (line 29)
* GNU Gettext support: gettext. (line 6)
-* GNU make extensions: General Operation. (line 20)
+* GNU Make extensions: General Operation. (line 20)
* GNU Makefile standards: Introduction. (line 12)
* gnu strictness: Strictness. (line 18)
* GNUmakefile including Makefile: Third-Party Makefiles.
(line 114)
+* gzip: The Types of Distributions.
+ (line 10)
* hard error: Generalities about Testing.
(line 48)
* Header files in _SOURCES: Program Sources. (line 39)
* HEADERS primary, defined: Headers. (line 6)
* HEADERS, installation directories: Headers. (line 6)
* Hello World example: Hello World. (line 6)
+* help2man, and dist target: List of Automake options.
+ (line 81)
* hook targets: Extending. (line 66)
* HP-UX 10, lex problems: Public Macros. (line 94)
* html: Texinfo. (line 25)
* html <1>: Extending. (line 41)
* HTML output using Texinfo: Texinfo. (line 6)
* html-local: Extending. (line 41)
-* id: Tags. (line 43)
+* id: Tags. (line 45)
* if: Usage of Conditionals.
(line 36)
* include: Basics of Distribution.
- (line 22)
+ (line 30)
* include <1>: Include. (line 6)
* include, distribution: Basics of Distribution.
- (line 22)
+ (line 30)
* Including Makefile fragment: Include. (line 6)
* indentation in Makefile.am: General Operation. (line 33)
* info: List of Automake options.
- (line 97)
+ (line 108)
* info <1>: Extending. (line 41)
* info-in-builddir: List of Automake options.
(line 57)
@@ -5809,13 +5917,13 @@ B.3 General Index
* install-html-local: Extending. (line 41)
* install-info: Texinfo. (line 85)
* install-info <1>: List of Automake options.
- (line 97)
+ (line 108)
* install-info <2>: Extending. (line 41)
* install-info target: Texinfo. (line 85)
* install-info-local: Extending. (line 41)
* install-man: Man Pages. (line 32)
* install-man <1>: List of Automake options.
- (line 103)
+ (line 114)
* install-man target: Man Pages. (line 32)
* install-pdf: Texinfo. (line 25)
* install-pdf <1>: Extending. (line 41)
@@ -5854,7 +5962,7 @@ B.3 General Index
* Java to native code, compilation: Java Support with gcj.
(line 6)
* lazy test execution: Parallel Test Harness.
- (line 118)
+ (line 127)
* LDADD and -l: Linking. (line 70)
* LDFLAGS and AM_LDFLAGS: Flag Variables Ordering.
(line 20)
@@ -5892,8 +6000,10 @@ B.3 General Index
* LTLIBRARIES primary, defined: Libtool Libraries. (line 6)
* ltmain.sh not found: Error required file ltmain.sh not found.
(line 6)
+* lzip: The Types of Distributions.
+ (line 23)
* m4_include, distribution: Basics of Distribution.
- (line 22)
+ (line 30)
* Macro search path: Macro Search Path. (line 6)
* macro serial numbers: Serials. (line 6)
* Macros Automake recognizes: Optional. (line 6)
@@ -5912,7 +6022,7 @@ B.3 General Index
(line 128)
* make install support: Install. (line 6)
* make installcheck, testing --help and --version: List of Automake options.
- (line 133)
+ (line 144)
* Make rules, overriding: General Operation. (line 46)
* Make targets, overriding: General Operation. (line 46)
* Makefile fragment, including: Include. (line 6)
@@ -5954,24 +6064,26 @@ B.3 General Index
(line 70)
* no-dist: List of Automake options.
(line 77)
-* no-dist-gzip: List of Automake options.
+* no-dist-built-sources: List of Automake options.
(line 81)
+* no-dist-gzip: List of Automake options.
+ (line 92)
* no-dist-gzip <1>: List of Automake options.
- (line 81)
+ (line 92)
* no-exeext: List of Automake options.
- (line 84)
+ (line 95)
* no-installinfo: Texinfo. (line 85)
* no-installinfo <1>: List of Automake options.
- (line 94)
+ (line 105)
* no-installinfo option: Texinfo. (line 85)
* no-installman: Man Pages. (line 32)
* no-installman <1>: List of Automake options.
- (line 100)
+ (line 111)
* no-installman option: Man Pages. (line 32)
* no-op Automake targets: Third-Party Makefiles.
(line 88)
* no-texinfo.tex: List of Automake options.
- (line 110)
+ (line 121)
* nobase_ and dist_ or nodist_: Alternative. (line 28)
* nobase_ prefix: Alternative. (line 22)
* nodist_ and nobase_: Alternative. (line 28)
@@ -5980,7 +6092,7 @@ B.3 General Index
* Non-GNU packages: Strictness. (line 6)
* Non-standard targets: General Operation. (line 12)
* nostdinc: List of Automake options.
- (line 106)
+ (line 117)
* notrans_ and dist_ or nodist_: Man Pages. (line 63)
* notrans_ prefix: Man Pages. (line 54)
* OBJCFLAGS and AM_OBJCFLAGS: Flag Variables Ordering.
@@ -5995,9 +6107,9 @@ B.3 General Index
* obsolete macros: Obsolete Macros. (line 6)
* optimized build, example: VPATH Builds. (line 48)
* Option, --warnings=CATEGORY: List of Automake options.
- (line 217)
+ (line 228)
* Option, -WCATEGORY: List of Automake options.
- (line 217)
+ (line 228)
* Option, check-news: List of Automake options.
(line 15)
* Option, dejagnu: List of Automake options.
@@ -6032,42 +6144,44 @@ B.3 General Index
(line 70)
* Option, no-dist: List of Automake options.
(line 77)
-* Option, no-dist-gzip: List of Automake options.
+* Option, no-dist-built-sources: List of Automake options.
(line 81)
+* Option, no-dist-gzip: List of Automake options.
+ (line 92)
* Option, no-exeext: List of Automake options.
- (line 84)
+ (line 95)
* Option, no-installinfo: Texinfo. (line 85)
* Option, no-installinfo <1>: List of Automake options.
- (line 94)
+ (line 105)
* Option, no-installman: Man Pages. (line 32)
* Option, no-installman <1>: List of Automake options.
- (line 100)
+ (line 111)
* Option, no-texinfo.tex: List of Automake options.
- (line 110)
+ (line 121)
* Option, nostdinc: List of Automake options.
- (line 106)
+ (line 117)
* Option, parallel-tests: List of Automake options.
- (line 118)
+ (line 129)
* Option, readme-alpha: List of Automake options.
- (line 124)
+ (line 135)
* Option, serial-tests: List of Automake options.
- (line 114)
+ (line 125)
* Option, tar-pax: List of Automake options.
- (line 163)
+ (line 174)
* Option, tar-ustar: List of Automake options.
- (line 163)
+ (line 174)
* Option, tar-v7: List of Automake options.
- (line 163)
+ (line 174)
* Option, VERSION: List of Automake options.
- (line 212)
+ (line 223)
* Option, warnings: List of Automake options.
- (line 217)
+ (line 228)
* Options, aclocal: aclocal Options. (line 6)
* Options, automake: automake Invocation. (line 37)
* Options, std-options: List of Automake options.
- (line 133)
+ (line 144)
* Options, subdir-objects: List of Automake options.
- (line 154)
+ (line 165)
* Ordering flag variables: Flag Variables Ordering.
(line 6)
* Overriding make rules: General Operation. (line 46)
@@ -6082,17 +6196,17 @@ B.3 General Index
(line 6)
* Parallel build trees: VPATH Builds. (line 6)
* parallel-tests: List of Automake options.
- (line 118)
+ (line 129)
* Path stripping, avoiding: Alternative. (line 22)
* pax format: List of Automake options.
- (line 163)
+ (line 174)
* pdf: Texinfo. (line 25)
* pdf <1>: Extending. (line 41)
* PDF output using Texinfo: Texinfo. (line 6)
* pdf-local: Extending. (line 41)
* Per-object flags, emulated: Per-Object Flags. (line 6)
* per-target compilation flags, defined: Program and Library Variables.
- (line 182)
+ (line 195)
* pkgdatadir, defined: Uniform. (line 19)
* pkgincludedir, defined: Uniform. (line 19)
* pkglibdir, defined: Uniform. (line 19)
@@ -6132,13 +6246,13 @@ B.3 General Index
* Ratfor programs: Preprocessing Fortran 77.
(line 6)
* read-only source tree: VPATH Builds. (line 91)
-* readme-alpha: List of Automake options.
- (line 124)
* README-alpha: Strictness. (line 78)
+* readme-alpha: List of Automake options.
+ (line 135)
* rebuild rules: Rebuilding. (line 6)
* rebuild rules <1>: CVS. (line 9)
* recheck: Parallel Test Harness.
- (line 130)
+ (line 139)
* Recognized macros by Automake: Optional. (line 6)
* Recursive operation of Automake: General Operation. (line 58)
* recursive targets and third-party Makefiles: Third-Party Makefiles.
@@ -6148,7 +6262,7 @@ B.3 General Index
* Register test result: Log files generation and test results recording.
(line 24)
* Renaming programs: Renaming. (line 6)
-* Reporting bugs: Introduction. (line 30)
+* Reporting bugs: Reporting Bugs. (line 6)
* Requirements of Automake: Requirements. (line 6)
* Requirements, Automake: Introduction. (line 26)
* Restrictions for JAVA: Java. (line 27)
@@ -6175,8 +6289,10 @@ B.3 General Index
* serial number and --install: aclocal Options. (line 42)
* serial numbers in macros: Serials. (line 6)
* serial-tests: List of Automake options.
- (line 114)
+ (line 125)
* serial-tests, Using: Serial Test Harness. (line 6)
+* shar: The Types of Distributions.
+ (line 51)
* Shared libraries, support for: A Shared Library. (line 6)
* Silencing make: Silencing Make. (line 6)
* Silent make: Silencing Make. (line 6)
@@ -6184,6 +6300,7 @@ B.3 General Index
* Silent rules: Silencing Make. (line 6)
* silent rules and libtool: Automake Silent Rules.
(line 59)
+* site-packages Python directory: Python. (line 87)
* site.exp: DejaGnu Tests. (line 26)
* source tree and build tree: VPATH Builds. (line 6)
* source tree, read-only: VPATH Builds. (line 91)
@@ -6191,7 +6308,7 @@ B.3 General Index
* Special Automake comment: General Operation. (line 68)
* Staged installation: DESTDIR. (line 14)
* std-options: List of Automake options.
- (line 133)
+ (line 144)
* Strictness, command line: automake Invocation. (line 37)
* Strictness, defined: Strictness. (line 10)
* Strictness, foreign: Strictness. (line 51)
@@ -6199,7 +6316,7 @@ B.3 General Index
* Strictness, gnu: Strictness. (line 18)
* su, before make install: Basic Installation. (line 49)
* subdir-objects: List of Automake options.
- (line 154)
+ (line 165)
* Subdirectories, building conditionally: Conditional Subdirectories.
(line 6)
* Subdirectories, configured conditionally: Unconfigured Subdirectories.
@@ -6235,13 +6352,13 @@ B.3 General Index
* tags: Tags. (line 9)
* TAGS support: Tags. (line 6)
* tar formats: List of Automake options.
- (line 163)
+ (line 174)
* tar-pax: List of Automake options.
- (line 163)
+ (line 174)
* tar-ustar: List of Automake options.
- (line 163)
+ (line 174)
* tar-v7: List of Automake options.
- (line 163)
+ (line 174)
* Target, install-info: Texinfo. (line 85)
* Target, install-man: Man Pages. (line 32)
* targets, making into no-op: Third-Party Makefiles.
@@ -6277,7 +6394,7 @@ B.3 General Index
* texinfo.tex: Auxiliary Programs. (line 77)
* texinfo.tex <1>: Texinfo. (line 70)
* TEXINFOS primary, defined: Texinfo. (line 6)
-* third-party files and CVS: CVS. (line 168)
+* third-party files and CVS: CVS. (line 167)
* Third-party packages, interfacing with: Third-Party Makefiles.
(line 6)
* timestamps and CVS: CVS. (line 29)
@@ -6299,7 +6416,7 @@ B.3 General Index
* uninstall-hook: Extending. (line 66)
* uninstall-local: Extending. (line 41)
* Unit tests: Parallel Test Harness.
- (line 154)
+ (line 163)
* Unpacking: Basic Installation. (line 27)
* UPCFLAGS and AM_UPCFLAGS: Flag Variables Ordering.
(line 20)
@@ -6309,9 +6426,9 @@ B.3 General Index
* user variables: User Variables. (line 6)
* Using aclocal: configure. (line 6)
* ustar format: List of Automake options.
- (line 163)
+ (line 174)
* v7 tar format: List of Automake options.
- (line 163)
+ (line 174)
* Vala Support: Vala Support. (line 6)
* variables, conflicting: Extending. (line 14)
* Variables, overriding: General Operation. (line 51)
@@ -6328,10 +6445,16 @@ B.3 General Index
(line 39)
* xpass: Generalities about Testing.
(line 39)
+* xz: The Types of Distributions.
+ (line 30)
* yacc, multiple parsers: Yacc and Lex. (line 68)
* YFLAGS and AM_YFLAGS: Flag Variables Ordering.
(line 20)
* ylwrap: Auxiliary Programs. (line 85)
* ylwrap <1>: Yacc and Lex. (line 68)
* zardoz example: Complete. (line 35)
+* zip: The Types of Distributions.
+ (line 37)
+* zstd: The Types of Distributions.
+ (line 41)
diff --git a/doc/automake.texi b/doc/automake.texi
index 17bc2dae6..0a0da6168 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -25,7 +25,7 @@ This manual is for GNU Automake (version @value{VERSION},
@value{UPDATED}), a program that creates GNU standards-compliant
Makefiles from template files.
-Copyright @copyright{} 1995--2020 Free Software Foundation, Inc.
+Copyright @copyright{} 1995--2021 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -441,10 +441,6 @@ Automake requires @command{perl} in order to generate the
fully GNU standards-compliant, and do not require @command{perl} in order
to be built.
-@cindex Bugs, reporting
-@cindex Reporting bugs
-@cindex E-mail, bug reports
-
For more information on bug reports, @xref{Reporting Bugs}.
@node Autotools Introduction
@@ -1102,8 +1098,8 @@ create output.
For instance when installing GCC, the GNU Compiler Collection, we can
use @option{--target=@/@var{target}} to specify that we want to build
GCC as a cross-compiler for @var{target}. Mixing @option{--build} and
-@option{--target}, we can actually cross-compile a cross-compiler;
-such a three-way cross-compilation is known as a @dfn{Canadian cross}.
+@option{--target}, we can cross-compile a cross-compiler; such a
+three-way cross-compilation is known as a @dfn{Canadian cross}.
@xref{Specifying Names, , Specifying the System Type, autoconf, The
Autoconf Manual}, for more information about these @command{configure}
@@ -1670,7 +1666,7 @@ is an excerpt of @file{config.h} after @command{configure} has run:
As you probably noticed, @file{src/main.c} includes @file{config.h} so
it can use @code{PACKAGE_STRING}. In a real-world project,
-@file{config.h} can grow really big, with one @samp{#define} per
+@file{config.h} can grow quite large, with one @samp{#define} per
feature probed on the system.
The @code{AC_CONFIG_FILES} macro declares the list of files that
@@ -1814,15 +1810,15 @@ the Automake distribution includes a non-standard rule for the
@code{git-dist} target, which the Automake maintainer uses to make
distributions from the source control system.
-@cindex GNU make extensions
+@cindex GNU Make extensions
-Note that most GNU make extensions are not recognized by Automake. Using
+Note that most GNU Make extensions are not recognized by Automake. Using
such extensions in a @file{Makefile.am} will lead to errors or confusing
behavior.
@cindex Append operator
@cmindex +=
-A special exception is that the GNU make append operator, @samp{+=}, is
+A special exception is that the GNU Make append operator, @samp{+=}, is
supported. This operator appends its right hand argument to the variable
specified on the left. Automake will translate the operator into
an ordinary @samp{=} operator; @samp{+=} will thus work with any make program.
@@ -1936,7 +1932,7 @@ The strictness levels are:
@opindex --gnu
This is the default level of strictness. Automake will check for
basic compliance with the GNU standards for software packaging.
-@xref{Top,,, standards, The GNU Coding Standards} for full details
+@xref{Top,,, standards, The GNU Coding Standards}, for full details
of these standards. Currently the following checks are made:
@itemize @bullet
@@ -1987,16 +1983,17 @@ Automake will check for compliance to the as-yet-unwritten @dfn{Gnits
standards}. These are based on the GNU standards, but are even more
detailed. Unless you are a Gnits standards contributor, it is
recommended that you avoid this option until such time as the Gnits
-standard is actually published (which may never happen).
+standard is published (which is unlikely to ever happen).
Currently, @option{--gnits} does all the checks that
@option{--gnu} does, and checks the following as well:
@itemize @bullet
@item
-@samp{make installcheck} will check to make sure that the @option{--help}
-and @option{--version} really print a usage message and a version string,
-respectively. This is the @option{std-options} option (@pxref{Options}).
+@samp{make installcheck} will check to make sure that the
+@option{--help} and @option{--version} print a usage message and a
+version string, respectively. This is the @option{std-options} option
+(@pxref{Options}).
@item
@samp{make dist} will check to make sure the @file{NEWS} file has been
@@ -2100,10 +2097,10 @@ Note that the common @samp{dir} suffix is left off when constructing the
variable names; thus one writes @samp{bin_PROGRAMS} and not
@samp{bindir_PROGRAMS}.
-Not every sort of object can be installed in every directory. Automake
-will flag those attempts it finds in error (but see below how to override
-the check if you really need to).
-Automake will also diagnose obvious misspellings in directory names.
+Not every sort of object can be installed in every directory.
+Automake will flag those attempts it finds in error (but see below how
+to override the check if you need to). Automake will also diagnose
+obvious misspellings in directory names.
@cindex Extending list of installation directories
@cindex Installation directories, extending list
@@ -2127,8 +2124,8 @@ xml_DATA = file.xml
This feature can also be used to override the sanity checks Automake
performs to diagnose suspicious directory/primary couples (in the
-unlikely case these checks are undesirable, and you really know what
-you're doing). For example, Automake would error out on this input:
+unlikely case that you need to omit these checks). For example,
+Automake would error out on this input:
@c Should be tested in primary-prefix-invalid-couples.sh
@example
@@ -3045,6 +3042,12 @@ Automake will look for various helper scripts, such as
Not all scripts are always searched for; some scripts
will only be sought if the generated @file{Makefile.in} requires them.
+If @code{AC_CONFIG_AUX_DIR} is used, it must be given before the call
+to @code{AM_INIT_AUTOMAKE}; Automake will warn about this if it is not
+so. All other @code{AC_CONFIG_...} macros are conventionally called
+after @code{AM_INIT_AUTOMAKE}, though they may or may not work in
+other locations, with or without warnings.
+
If @code{AC_CONFIG_AUX_DIR} is not given, the scripts are looked for in
their standard locations. For @file{mdate-sh},
@file{texinfo.tex}, and @file{ylwrap}, the standard location is the
@@ -3065,20 +3068,22 @@ macro.
@item AC_CONFIG_HEADERS
Automake will generate rules to rebuild these headers from the
corresponding templates (usually, the template for a @file{foo.h}
-header being @file{foo.h.in}). Older versions of Automake
-required the use of @code{AM_CONFIG_HEADER}; this is no longer
-the case, and that macro has indeed been removed.
+header being @file{foo.h.in}).
As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
specification using shell variables will be ignored as far as
cleaning, distributing, and rebuilding is concerned.
+Older versions of Automake required the use of
+@code{AM_CONFIG_HEADER}; this is no longer the case, and that macro
+has indeed been removed.
+
@item AC_CONFIG_LINKS
Automake will generate rules to remove @file{configure} generated
links on @samp{make distclean} and to distribute named source files as
part of @samp{make dist}.
-As for @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
+As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
specification using shell variables will be ignored as far as cleaning
and distributing is concerned. (There are no rebuild rules for links.)
@@ -3241,9 +3246,9 @@ macros installed in a system-wide directory; @pxref{aclocal Invocation}).
@cindex Invoking @command{aclocal}
@cindex @command{aclocal}, Invoking
-Automake includes a number of Autoconf macros that can be used in
-your package (@pxref{Macros}); some of them are actually required by
-Automake in certain situations. These macros must be defined in your
+Automake includes a number of Autoconf macros that can be used in your
+package (@pxref{Macros}); some of them are required by Automake in
+certain situations. These macros must be defined in your
@file{aclocal.m4}; otherwise they will not be seen by
@command{autoconf}.
@@ -3288,9 +3293,9 @@ using @file{acinclude.m4} in new packages (@pxref{Local Macros}).
While computing @file{aclocal.m4}, @command{aclocal} runs
@command{autom4te} (@pxref{Using autom4te, , Using @command{Autom4te},
autoconf, The Autoconf Manual}) in order to trace the macros that are
-really used, and omit from @file{aclocal.m4} all macros that are
-mentioned but otherwise unexpanded (this can happen when a macro is
-called conditionally). @command{autom4te} is expected to be in the
+used, and omit from @file{aclocal.m4} all macros that are mentioned
+but otherwise unexpanded (this can happen when a macro is called
+conditionally). @command{autom4te} is expected to be in the
@env{PATH}, just as @command{autoconf}. Its location can be
overridden using the @env{AUTOM4TE} environment variable.
@@ -3336,8 +3341,8 @@ This option implies @option{--install} and @option{--dry-run}.
@item --dry-run
@opindex --dry-run
-Do not actually overwrite (or create) @file{aclocal.m4} and M4
-files installed by @option{--install}.
+Do not overwrite (or create) @file{aclocal.m4} and M4 files installed
+by @option{--install}.
@item --help
@opindex --help
@@ -3365,8 +3370,8 @@ search path (@pxref{Serials}).
@item --force
@opindex --force
-Always overwrite the output file. The default is to overwrite the output
-file only when really needed, i.e., when its contents change or if one
+Always overwrite the output file. The default is to overwrite the
+output file only when needed, i.e., when its contents change or if one
of its dependencies is younger.
This option forces the update of @file{aclocal.m4} (or the file
@@ -3645,16 +3650,16 @@ defined macro, not at the beginning of the file.
@acindex AC_DEFUN
@acindex AC_PREREQ
-Starting with Automake 1.8, @command{aclocal} will warn about all
-underquoted calls to @code{AC_DEFUN}. We realize this will annoy a
-lot of people, because @command{aclocal} was not so strict in the past
-and many third party macros are underquoted; and we have to apologize
-for this temporary inconvenience. The reason we have to be stricter
-is that a future implementation of @command{aclocal} (@pxref{Future of
+Starting with Automake 1.8, @command{aclocal} warns about all
+underquoted calls to @code{AC_DEFUN}. We realize this annoys some
+people, because @command{aclocal} was not so strict in the past and
+many third party macros are underquoted; and we have to apologize for
+this temporary inconvenience. The reason we have to be stricter is
+that a future implementation of @command{aclocal} (@pxref{Future of
aclocal}) will have to temporarily include all of these third party
-@file{.m4} files, maybe several times, including even files that are
-not actually needed. Doing so should alleviate many problems of the
-current implementation; however it requires a stricter style from the
+@file{.m4} files, maybe several times, even including files that end
+up not being needed. Doing so should alleviate many problems of the
+current implementation; however, it requires a stricter style from
macro authors. Hopefully it is easy to revise the existing macros.
For instance,
@@ -3681,10 +3686,10 @@ AX_BAR
@end example
Wrapping the @code{AC_PREREQ} call inside the macro ensures that
-Autoconf 2.68 will not be required if @code{AX_FOOBAR} is not actually
-used. Most importantly, quoting the first argument of @code{AC_DEFUN}
-allows the macro to be redefined or included twice (otherwise this
-first argument would be expanded during the second definition). For
+Autoconf 2.68 will not be required if @code{AX_FOOBAR} is not used.
+Most importantly, quoting the first argument of @code{AC_DEFUN} allows
+the macro to be redefined or included twice (otherwise this first
+argument would be expanded during the second definition). For
consistency we like to quote even arguments such as @code{2.68} that
do not require it.
@@ -3734,7 +3739,7 @@ system-wide directories, as explained in @ref{Macro Search Path}.
Custom macros should be distributed for the same reason that
@file{configure.ac} is: so that other people have all the sources of
-your package if they want to work on it. Actually, this distribution
+your package if they want to work on it. In fact, this distribution
happens automatically because all @code{m4_include}d files are
distributed.
@@ -3939,12 +3944,11 @@ macros you want to revert, and run @samp{aclocal --install}.
@subsection The Future of @command{aclocal}
@cindex @command{aclocal}'s scheduled death
-@command{aclocal} is expected to disappear. This feature really
-should not be offered by Automake. Automake should focus on
-generating @file{Makefile}s; dealing with M4 macros really is
-Autoconf's job. The fact that some people install Automake just to use
-@command{aclocal}, but do not use @command{automake} otherwise is an
-indication of how that feature is misplaced.
+Ideally, @command{aclocal} should not be part of Automake. Automake
+should focus on generating @file{Makefile}s; dealing with M4 macros is
+more Autoconf's job. The fact that some people install Automake just
+to use @command{aclocal}, but do not use @command{automake} otherwise
+is an indication of how that feature is misplaced.
The new implementation will probably be done slightly differently.
For instance, it could enforce the @file{m4/}-style layout discussed in
@@ -3968,19 +3972,19 @@ Many packages come with a script called @file{bootstrap} or
@file{autogen.sh}, that will just call @command{aclocal},
@command{libtoolize}, @command{gettextize} or @command{autopoint},
@command{autoconf}, @command{autoheader}, and @command{automake} in
-the right order. Actually this is precisely what @command{autoreconf}
+the right order. In fact, this is precisely what @command{autoreconf}
can do for you. If your package has such a @file{bootstrap} or
@file{autogen.sh} script, consider using @command{autoreconf}. That
-should simplify its logic a lot (less things to maintain, yum!), it's
-even likely you will not need the script anymore, and more to the point
-you will not call @command{aclocal} directly anymore.
+should simplify its logic a lot (less things to maintain, all to the
+good), it's even likely you will not need the script anymore, and more
+to the point you will not call @command{aclocal} directly anymore.
For the time being, third-party packages should continue to install
public macros into @file{/usr/share/aclocal/}. If @command{aclocal}
is replaced by another tool it might make sense to rename the
directory, but supporting @file{/usr/share/aclocal/} for backward
-compatibility should be really easy provided all macros are properly
-written (@pxref{Extending aclocal}).
+compatibility should be easy provided all macros are properly written
+(@pxref{Extending aclocal}).
@@ -4549,7 +4553,7 @@ which directories listed in the latter should be built.
@item Any directory listed in @code{DIST_SUBDIRS} and @code{SUBDIRS}
must be configured.
-I.e., the @file{Makefile} must exist or the recursive @command{make}
+That is, the @file{Makefile} must exist or the recursive @command{make}
rules will not be able to process the directory.
@item Any configured directory must be listed in @code{DIST_SUBDIRS}.
@@ -4665,7 +4669,6 @@ an otherwise equivalent set of variables without @samp{nobase_} prefix.
@acindex AC_CONFIG_SUBDIRS
@acindex AC_CONFIG_AUX_DIR
-
In the GNU Build System, packages can be nested to arbitrary depth.
This means that a package can embed other packages with their own
@file{configure}, @file{Makefile}s, etc.
@@ -4750,14 +4753,14 @@ copies of @file{install-sh}: one in the top-level of the @code{arm}
package, and another one in the @file{hand/} subdirectory for the
@code{hand} package.
-The historical default is to search for these auxiliary scripts in
-the parent directory and the grandparent directory. So if the
+The historical default is to search for these auxiliary scripts in the
+parent directory and the grandparent directory. So if the
@samp{AC_CONFIG_AUX_DIR([.])} line was removed from
@file{hand/configure.ac}, that subpackage would share the auxiliary
script of the @code{arm} package. This may look like a gain in size
-(a few kilobytes), but it is actually a loss of modularity as the
-@code{hand} subpackage is no longer self-contained (@samp{make dist}
-in the subdirectory will not work anymore).
+(a few kilobytes), but more importantly, it is a loss of modularity as
+the @code{hand} subpackage is no longer self-contained (@samp{make
+dist} in the subdirectory will not work anymore).
Packages that do not use Automake need more work to be integrated this
way. @xref{Third-Party Makefiles}.
@@ -4930,7 +4933,7 @@ this purpose.
@vindex maude_DEPENDENCIES
@vindex EXTRA_maude_DEPENDENCIES
It is also occasionally useful to have a program depend on some other
-target that is not actually part of that program. This can be done
+target that is not in fact part of that program. This can be done
using either the @code{@var{prog}_DEPENDENCIES} or the
@code{EXTRA_@var{prog}_DEPENDENCIES} variable. Each program depends on
the contents both variables, but no further interpretation is done.
@@ -5440,7 +5443,7 @@ into one big installed library.
Libtool convenience libraries are declared by directory-less variables
such as @code{noinst_LTLIBRARIES}, @code{check_LTLIBRARIES}, or even
@code{EXTRA_LTLIBRARIES}. Unlike installed libtool libraries they do
-not need an @option{-rpath} flag at link time (actually this is the only
+not need an @option{-rpath} flag at link time (this is in fact the only
difference).
Convenience libraries listed in @code{noinst_LTLIBRARIES} are always
@@ -5673,8 +5676,8 @@ libfoo_la_SOURCES = foo.c @dots{}
@noindent
(In this trivial case the issue could be avoided by linking
@file{libfoo.la} with @file{prog} instead of listing @file{foo.c} in
-@code{prog_SOURCES}. But let's assume we really want to keep
-@file{prog} and @file{libfoo.la} separate.)
+@code{prog_SOURCES}. But let's assume we want to keep @file{prog} and
+@file{libfoo.la} separate.)
Technically, it means that we should build @file{foo.$(OBJEXT)} for
@file{prog}, and @file{foo.lo} for @file{libfoo.la}. The problem is
@@ -5758,18 +5761,25 @@ be put into the current build directory. However, if the option
@file{.o} file will be put into the subdirectory named after the
source file. For instance, with @option{subdir-objects} enabled,
@file{sub/dir/file.c} will be compiled to @file{sub/dir/file.o}. Some
-people prefer this mode of operation. You can specify
+projects prefer or require this mode of operation. You can specify
@option{subdir-objects} in @code{AUTOMAKE_OPTIONS} (@pxref{Options}).
@cindex Subdirectory, objects in
@cindex Objects in subdirectory
+@c https://bugs.gnu.org/20699
+When @option{subdir-objects} is specified, and source files which lie
+outside the current directory tree are nevertheless specified, as in
+@code{foo_SOURCES = ../lib/other.c}, Automake will still remove
+@file{../lib/other.o}, in fact, @file{../lib/*.o} (e.g., at @code{make
+clean}, even though it is arguably wrong for one subdirectory to
+clean in a sibling. This may or may not be changed in the future.
@item EXTRA_maude_SOURCES
Automake needs to know the list of files you intend to compile
@emph{statically}. For one thing, this is the only way Automake has of
knowing what sort of language support a given @file{Makefile.in}
-requires. @footnote{There are other, more obscure reasons for
-this limitation as well.} This means that, for example, you can't put a
+requires. (There are other, more obscure reasons for
+this limitation as well.) This means that, for example, you can't put a
configure substitution like @samp{@@my_sources@@} into a @samp{_SOURCES}
variable. If you intend to conditionally compile source files and use
@file{configure} to substitute the appropriate object names into, e.g.,
@@ -5825,7 +5835,11 @@ of any library built by your package. Doing so will ensure that
@item maude_LDFLAGS
This variable is used to pass extra flags to the link step of a program
-or a shared library. It overrides the @code{AM_LDFLAGS} variable.
+or a shared library. It overrides the @code{AM_LDFLAGS} variable,
+even if it is defined only in a false branch of a conditional; in
+other words, if @code{@var{prog}_LDFLAGS} is defined at all,
+@code{AM_LDFLAGS} will not be used.
+@c https://bugs.gnu.org/34925
@item maude_LIBTOOLFLAGS
This variable is used to pass extra options to @command{libtool}.
@@ -5837,7 +5851,7 @@ the compiler or linker flags). @xref{Libtool Flags}.
@item maude_DEPENDENCIES
@itemx EXTRA_maude_DEPENDENCIES
It is also occasionally useful to have a target (program or library)
-depend on some other file that is not actually part of that target.
+depend on some other file that is not in fact part of that target.
This can be done using the @code{_DEPENDENCIES} variable. Each
target depends on the contents of such a variable, but no further
interpretation is done.
@@ -5889,6 +5903,9 @@ and used by Automake due to the use of per-target link flags such as
@code{_CFLAGS}, @code{_LDFLAGS} or @code{_LIBTOOLFLAGS}, in cases where
they apply.
+If the variable @code{AM_V_*_LINK} exists, it is used to output a
+status line in silent mode; otherwise, @code{AM_V_GEN} is used.
+
@item maude_CCASFLAGS
@itemx maude_CFLAGS
@itemx maude_CPPFLAGS
@@ -6251,8 +6268,8 @@ not used, in preference to the per-executable (or per-library)
@code{_CFLAGS}.
@item COMPILE
-This is the command used to actually compile a C source file. The
-file name is appended to form the complete command line.
+This is the command used to compile a C source file. The file name is
+appended to form the complete command line.
@item AM_LDFLAGS
This is the variable the @file{Makefile.am} author can use to pass
@@ -6260,12 +6277,13 @@ in additional linker flags. In some situations, this is not used, in
preference to the per-executable (or per-library) @code{_LDFLAGS}.
@item LINK
-This is the command used to actually link a C program. It already
-includes @samp{-o $@@} and the usual variable references (for instance,
-@code{CFLAGS}); it takes as ``arguments'' the names of the object files
-and libraries to link in. This variable is not used when the linker is
-overridden with a per-target @code{_LINK} variable or per-target flags
-cause Automake to define such a @code{_LINK} variable.
+This is the command used to link a C program. It already includes
+@samp{-o $@@} and the usual variable references (for instance,
+@code{CFLAGS}); it takes as ``arguments'' the names of the object
+files and libraries to link in. This variable is not used when the
+linker is overridden with a per-target @code{_LINK} variable or
+per-target flags cause Automake to define such a @code{_LINK}
+variable.
@end vtable
@@ -6447,11 +6465,11 @@ Any flags to pass to the C++ compiler.
The maintainer's variant of @code{CXXFLAGS}.
@item CXXCOMPILE
-The command used to actually compile a C++ source file. The file name
-is appended to form the complete command line.
+The command used to compile a C++ source file. The file name is
+appended to form the complete command line.
@item CXXLINK
-The command used to actually link a C++ program.
+The command used to link a C++ program.
@end vtable
@@ -6482,11 +6500,11 @@ Any flags to pass to the Objective C compiler.
The maintainer's variant of @code{OBJCFLAGS}.
@item OBJCCOMPILE
-The command used to actually compile an Objective C source file. The
-file name is appended to form the complete command line.
+The command used to compile an Objective C source file. The file name
+is appended to form the complete command line.
@item OBJCLINK
-The command used to actually link an Objective C program.
+The command used to link an Objective C program.
@end vtable
@@ -6517,11 +6535,11 @@ Any flags to pass to the Objective C++ compiler.
The maintainer's variant of @code{OBJCXXFLAGS}.
@item OBJCXXCOMPILE
-The command used to actually compile an Objective C++ source file. The
-file name is appended to form the complete command line.
+The command used to compile an Objective C++ source file. The file
+name is appended to form the complete command line.
@item OBJCXXLINK
-The command used to actually link an Objective C++ program.
+The command used to link an Objective C++ program.
@end vtable
@@ -6551,11 +6569,11 @@ Any flags to pass to the Unified Parallel C compiler.
The maintainer's variant of @code{UPCFLAGS}.
@item UPCCOMPILE
-The command used to actually compile a Unified Parallel C source file.
-The file name is appended to form the complete command line.
+The command used to compile a Unified Parallel C source file. The
+file name is appended to form the complete command line.
@item UPCLINK
-The command used to actually link a Unified Parallel C program.
+The command used to link a Unified Parallel C program.
@end vtable
@@ -6623,13 +6641,11 @@ Any flags to pass to the Ratfor compiler.
The maintainer's variant of @code{RFLAGS}.
@item F77COMPILE
-The command used to actually compile a Fortran 77 source file. The file
-name is appended to form the complete command line.
+The command used to compile a Fortran 77 source file. The file name
+is appended to form the complete command line.
@item FLINK
-The command used to actually link a pure Fortran 77 program or shared
-library.
-
+The command used to link a pure Fortran 77 program or shared library.
@end vtable
Automake can handle preprocessing Fortran 77 and Ratfor source files in
@@ -6860,13 +6876,11 @@ Any flags to pass to the Fortran 9x compiler.
The maintainer's variant of @code{FCFLAGS}.
@item FCCOMPILE
-The command used to actually compile a Fortran 9x source file. The file
-name is appended to form the complete command line.
+The command used to compile a Fortran 9x source file. The file name
+is appended to form the complete command line.
@item FCLINK
-The command used to actually link a pure Fortran 9x program or shared
-library.
-
+The command used to link a pure Fortran 9x program or shared library.
@end vtable
@menu
@@ -6953,7 +6967,7 @@ This requires valac version 0.7.0 or later, and currently requires
the user to use GNU @command{make}.
@example
-foo_SOURCES = foo.vala bar.vala zardoc.c
+foo_SOURCES = foo.vala bar.vala zardoz.c
@end example
Any @file{.vala} file listed in a @code{_SOURCES} variable will be
@@ -7130,9 +7144,9 @@ the @option{no-exeext} option, this use will give a diagnostic.
@node Other Objects
@chapter Other Derived Objects
-Automake can handle derived objects that are not C programs. Sometimes
-the support for actually building such objects must be explicitly
-supplied, but Automake will still automatically handle installation and
+Automake can handle derived objects that are not C programs.
+Sometimes the support for building such objects must be explicitly
+supplied, but Automake can still automatically handle installation and
distribution.
@menu
@@ -7283,7 +7297,7 @@ will install the two files as @file{$(includedir)/foo.h} and
Usually, only header files that accompany installed libraries need to
be installed. Headers used by programs or convenience libraries are
not installed. The @code{noinst_HEADERS} variable can be used for
-such headers. However when the header actually belongs to a single
+such headers. However, when the header belongs to a single
convenience library or program, we recommend listing it in the
program's or library's @code{_SOURCES} variable (@pxref{Program
Sources}) instead of in @code{noinst_HEADERS}. This is clearer for
@@ -7375,12 +7389,12 @@ So, to conclude our introductory example, we could use
any other target (including @file{foo.o}) during @samp{make all} or
@samp{make check}.
-@code{BUILT_SOURCES} is actually a bit of a misnomer, as any file which
-must be created early in the build process can be listed in this
-variable. Moreover, all built sources do not necessarily have to be
-listed in @code{BUILT_SOURCES}. For instance, a generated @file{.c} file
-doesn't need to appear in @code{BUILT_SOURCES} (unless it is included by
-another source), because it's a known dependency of the associated
+@code{BUILT_SOURCES} is a bit of a misnomer, as any file which must be
+created early in the build process can be listed in this variable.
+Moreover, all built sources do not necessarily have to be listed in
+@code{BUILT_SOURCES}. For instance, a generated @file{.c} file
+doesn't need to appear in @code{BUILT_SOURCES} (unless it is included
+by another source), because it's a known dependency of the associated
object.
To emphasize, @code{BUILT_SOURCES} is honored only by @samp{make all},
@@ -7521,11 +7535,10 @@ bindir.h: Makefile
You don't have to list @emph{all} the dependencies of @file{foo.o}
explicitly, only those that might need to be built. If a dependency
already exists, it will not hinder the first compilation and will be
-recorded by the normal dependency tracking code. (Note that after
-this first compilation the dependency tracking code will also have
-recorded the dependency between @file{foo.o} and
-@file{bindir.h}, so our explicit dependency is really useful to
-the first build only.)
+recorded by the normal dependency tracking code. (After this first
+compilation, the dependency tracking code will also have recorded the
+dependency between @file{foo.o} and @file{bindir.h}, so our explicit
+dependency is only useful to the first build.)
Adding explicit dependencies like this can be a bit dangerous if you are
not careful enough. This is due to the way Automake tries not to
@@ -7644,7 +7657,7 @@ will be passed to the Emacs invocation.
Byte-compiled Emacs Lisp files are not portable among all versions of
Emacs, so it makes sense to turn this off if you expect sites to have
more than one version of Emacs installed. Furthermore, many packages
-don't actually benefit from byte-compilation. Still, we recommend
+do not actually benefit from byte-compilation. Still, we recommend
that you byte-compile your Emacs Lisp sources. It is probably better
for sites with strange setups to cope for themselves than to make the
installation less nice for everybody else.
@@ -7783,31 +7796,34 @@ This variable is a shell expression that is used to set the
Automake provides support for Python compilation with the
@code{PYTHON} primary. A typical setup is to call
-@code{AM_PATH_PYTHON} in @file{configure.ac} and use a line like the
-following in @file{Makefile.am}:
+@code{AM_PATH_PYTHON} in @file{configure.ac} and use a line like this
+in @file{Makefile.am}:
@example
python_PYTHON = tree.py leave.py
@end example
-Any files listed in a @code{_PYTHON} variable will be byte-compiled
-with @command{py-compile} at install time. @command{py-compile}
-actually creates both standard (@file{.pyc}) and optimized
-(@file{.pyo}) byte-compiled versions of the source files. Note that
-because byte-compilation occurs at install time, any files listed in
-@code{noinst_PYTHON} will not be compiled. Python source files are
-included in the distribution by default; prepend @code{nodist_} (as in
-@code{nodist_python_PYTHON}) to omit them.
+Python source files are included in the distribution by default;
+prepend @code{nodist_} (as in @code{nodist_python_PYTHON}) to omit
+them.
+
+@cindex @file{.pyc}, @file{.pyo} files
+At install time, any files listed in a @code{_PYTHON} variable will be
+byte-compiled with @command{py-compile}. @command{py-compile} creates
+both standard (@file{.pyc}) and optimized (@file{.pyo}) byte-compiled
+versions of the source files. Because byte-compilation occurs at
+install time, files listed in @code{noinst_PYTHON} will not be
+compiled.
-Automake ships with an Autoconf macro called @code{AM_PATH_PYTHON}
-that will determine some Python-related directory variables (see
-below). If you have called @code{AM_PATH_PYTHON} from
-@file{configure.ac}, then you may use the variables
+Automake ships with an Autoconf macro named @code{AM_PATH_PYTHON} that
+determines some Python-related directory variables (see below). If
+you have called @code{AM_PATH_PYTHON} from @file{configure.ac}, then
+you may use the variables
@c Keep in sync with primary-prefix-couples-documented-valid.sh
-@code{python_PYTHON} or @code{pkgpython_PYTHON} to list Python source
-files in your @file{Makefile.am}, depending on where you want your files
-installed (see the definitions of @code{pythondir} and
-@code{pkgpythondir} below).
+@code{python_PYTHON} and @code{pkgpython_PYTHON} to list Python source
+files in your @file{Makefile.am}, depending on whether you want your
+files installed in @code{pythondir} or @code{pkgpythondir},
+respectively.
@defmac AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found},
@ovar{action-if-not-found})
@@ -7821,15 +7837,15 @@ If an interpreter is found and satisfies @var{version}, then
run.
If @var{action-if-not-found} is not specified, as in the following
-example, the default is to abort @command{configure}.
+example, the default is to abort @command{configure}:
@example
-AM_PATH_PYTHON([2.2])
+AM_PATH_PYTHON([2.5])
@end example
@noindent
This is fine when Python is an absolute requirement for the package.
-If Python >= 2.5 was only @emph{optional} to the package,
+If Python @geq{} 2.5 was only @emph{optional} for the package,
@code{AM_PATH_PYTHON} could be called as follows.
@example
@@ -7840,7 +7856,7 @@ If the @env{PYTHON} variable is set when @code{AM_PATH_PYTHON} is
called, then that will be the only Python interpreter that is tried.
@code{AM_PATH_PYTHON} creates the following output variables based on
-the Python installation found during configuration.
+the Python installation found during configuration:
@end defmac
@vtable @code
@@ -7859,26 +7875,33 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
@end example
@item PYTHON_VERSION
+@vindex sys.version_info @r{Python variable}
The Python version number, in the form @var{major}.@var{minor}
-(e.g., @samp{2.5}). This is currently the value of
+(e.g., @samp{2.5}). This is set to be the value of
@samp{'%u.%u' % sys.version_info[:2]}.
@item PYTHON_PREFIX
-The string @samp{$@{prefix@}}. This term may be used in future work
-that needs the contents of Python's @samp{sys.prefix}, but general
-consensus is to always use the value from @command{configure}.
-
-@item PYTHON_EXEC_PREFIX
-The string @samp{$@{exec_prefix@}}. This term may be used in future work
-that needs the contents of Python's @samp{sys.exec_prefix}, but general
-consensus is to always use the value from @command{configure}.
+@itemx PYTHON_EXEC_PREFIX
+@opindex --with-python_prefix
+@opindex --with-python_exec_prefix
+@vindex sys.prefix @r{Python variable}
+@vindex sys.exec_prefix @r{Python variable}
+The value of Python's @samp{sys.prefix} (resp.@:
+@samp{sys.exec_prefix}) variable. Sometimes the same as the standard
+@samp{$@{prefix@}} (@samp{$@{exec_prefix@}}), but differs on some
+platforms such as Mac@tie{}OS@tie{}x (where Python is usually
+installed as a Framework). Can be set explicitly with the
+@option{--with-python_prefix} (@option{--with-python_exec_prefix})
+@file{configure} option.
@item PYTHON_PLATFORM
+@vindex sys.platform @r{Python variable}
The canonical name used by Python to describe the operating system, as
given by @samp{sys.platform}. This value is sometimes needed when
building Python extensions.
@item pythondir
+@cindex @file{site-packages} Python directory
The directory name for the @file{site-packages} subdirectory of the
standard Python install tree.
@@ -7904,9 +7927,9 @@ This is a convenience variable that is defined as
@samp{$(pyexecdir)/$(PACKAGE)}.
@end vtable
-All of these directory variables have values that start with either
-@samp{$@{prefix@}} or @samp{$@{exec_prefix@}} unexpanded. This works
-fine in @file{Makefiles}, but it makes these variables hard to use in
+All of these directory variables have values that can start with either
+@samp{$@{prefix@}} or @samp{$@{exec_prefix@}}, unexpanded. This works
+fine in @file{Makefile}s, but it makes these variables hard to use in
@file{configure}. This is mandated by the GNU coding standards, so
that the user can run @samp{make prefix=/foo install}. The Autoconf
manual has a section with more details on this topic
@@ -8021,10 +8044,11 @@ file for each Texinfo file. Automake will treat any include in a
Texinfo file that matches @file{vers*.texi} just as an automatically
generated version file.
-Sometimes an info file actually depends on more than one @file{.texi}
-file. For instance, in GNU Hello, @file{hello.texi} includes the file
+Often an Info file depends on more than one @file{.texi} file. For
+instance, in GNU Hello, @file{hello.texi} includes the file
@file{fdl.texi}. You can tell Automake about these dependencies using
-the @code{@var{texi}_TEXINFOS} variable. Here is how GNU Hello does it:
+the @code{@var{texi}_TEXINFOS} variable. Here is how GNU Hello does
+it:
@vindex TEXINFOS
@vindex _TEXINFOS
@@ -8244,10 +8268,10 @@ notrans_dist_man3_MANS = bar.3
@cindex Installation support
@cindex @samp{make install} support
-Naturally, Automake handles the details of actually installing your
-program once it has been built. All files named by the various
-primaries are automatically installed in the appropriate places when the
-user runs @samp{make install}.
+Naturally, Automake handles the details of installing your program
+once it has been built. All files named by the various primaries are
+automatically installed in the appropriate places when the user runs
+@samp{make install}.
@menu
* Basics of Installation:: What gets installed where
@@ -8494,59 +8518,91 @@ We recommend that you follow this same set of heuristics in your
@vindex VERSION
@trindex dist
The @code{dist} rule in the generated @file{Makefile.in} can be used
-to generate a gzipped @code{tar} file and other flavors of archive for
-distribution. The file is named based on the @code{PACKAGE} and
+to generate a gzipped @code{tar} file and/or other flavors of archives
+for distribution. The file is named based on the @code{PACKAGE} and
@code{VERSION} variables automatically defined by either the
@code{AC_INIT} invocation or by a @emph{deprecated} two-arguments
-invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public Macros}
-for how these variables get their values, from either defaults or explicit
-values---it's slightly trickier than one would expect).
-More precisely the gzipped @code{tar} file is named
+invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public
+Macros} for how these variables get their values, from either defaults
+or explicit values---it's slightly trickier than one would expect).
+More precisely, the gzipped @code{tar} file is named
@samp{$@{PACKAGE@}-$@{VERSION@}.tar.gz}.
-@vindex GZIP_ENV
-You can use the @command{make} variable @code{GZIP_ENV} to control how gzip
-is run. The default setting is @option{--best}.
-
@c See automake #9822.
@vindex TAR
You can set the environment variable @code{TAR} to override the tar
-program used; it defaults to @code{tar}.
+program used; it defaults to @code{tar}. @xref{The Types of
+Distributions}, for how to generate other kinds of archives.
+
+For the most part, the files to distribute are automatically found by
+Automake:
+
+@itemize @bullet
+@item
+All source files are automatically included in a distribution, as are
+all @file{Makefile.am} and @file{Makefile.in} files.
+
+@acindex AC_CONFIG_FILES
+@item
+Files that are read by @command{configure} are automatically
+distributed. These are the source files as specified in various
+Autoconf macros such as @code{AC_CONFIG_FILES} and siblings.
@cindex @code{m4_include}, distribution
@cindex @code{include}, distribution
@acindex m4_include
@cmindex include
-For the most part, the files to distribute are automatically found by
-Automake: all source files are automatically included in a distribution,
-as are all @file{Makefile.am} and @file{Makefile.in} files. Automake also
-has a built-in list of commonly used files that are automatically
-included if they are found in the current directory (either physically,
-or as the target of a @file{Makefile.am} rule); this list is printed by
-@samp{automake --help}. Note that some files in this list are actually
-distributed only if other certain conditions hold (for example,
+@item
+Files included in a @file{Makefile.am} (using @code{include}) or in
+@file{configure.ac} (using @code{m4_include}).
+
+@item
+Automake has a built-in list of commonly used files automatically
+included in the distribution if they are found in the current
+directory (either physically, or as the target of a @file{Makefile.am}
+rule). Some common examples: @file{ABOUT-GNU}, @file{COPYING},
+@file{TODO}.
+
+This list also includes helper scripts installed with @samp{automake
+--add-missing}. Some common examples: @file{compile},
+@file{config.guess}, @file{config.rpath}, @file{config.sub},
+@file{texinfo.tex}.
+
+@item
+Automake has another built-in list of files automatically distributed
+if they are found either with the plain name, or with extension
+@file{.md} (presumably MarkDown, though this not checked). They are
+checked for in that order, so the plain name is preferred. These are:
+@file{AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS}.
+
+@item
+A final built-in list of files are those distributed only if other
+certain conditions hold. For example,
@c Keep in sync with autodist-config-headers.sh
-the @file{config.h.top} and @file{config.h.bot} files are automatically
-distributed only if, e.g., @samp{AC_CONFIG_HEADERS([config.h])} is used
-in @file{configure.ac}). Also, files that are read by @command{configure}
-(i.e.@: the source files corresponding to the files specified in various
-Autoconf macros such as @code{AC_CONFIG_FILES} and siblings) are
-automatically distributed. Files included in a @file{Makefile.am} (using
-@code{include}) or in @file{configure.ac} (using @code{m4_include}), and
-helper scripts installed with @samp{automake --add-missing} are also
-distributed.
+the files @file{config.h.top} and @file{config.h.bot} are
+automatically distributed only if, e.g.,
+@samp{AC_CONFIG_HEADERS([config.h])} is used in @file{configure.ac}).
+@file{README-alpha} is another such file, with @file{README-alpha.md}
+distributed if that is what is available; @pxref{Strictness}, for its
+conditions for distribution.
+
+@end itemize
+
+@noindent
+These three lists of files are given in their entirety in the output
+from @code{automake --help}.
@vindex EXTRA_DIST
-Still, sometimes there are files that must be distributed, but which
-are not covered in the automatic rules. These files should be listed in
-the @code{EXTRA_DIST} variable. You can mention files from
-subdirectories in @code{EXTRA_DIST}.
-
-You can also mention a directory in @code{EXTRA_DIST}; in this case the
-entire directory will be recursively copied into the distribution.
-Please note that this will also copy @emph{everything} in the directory,
-including, e.g., Subversion's @file{.svn} private directories or CVS/RCS
-version control files; thus we recommend against using this feature
+Despite all this automatic inclusion, it is still common to have files
+to be distributed which are not found by the automatic rules. You
+should listed these files in the @code{EXTRA_DIST} variable. You can
+mention files in subdirectories in @code{EXTRA_DIST}.
+
+You can also mention a directory in @code{EXTRA_DIST}; in this case
+the entire directory will be recursively copied into the distribution.
+To emphasize, this copies @emph{everything} in the directory,
+including temporary editor files, intermediate build files, version
+control files, etc.; thus we recommend against using this feature
as-is. However, you can use the @code{dist-hook} feature to
ameliorate the problem; @pxref{The dist Hook}.
@@ -8601,20 +8657,20 @@ a directory in @code{EXTRA_DIST}:
EXTRA_DIST = doc
dist-hook:
chmod -R u+w $(distdir)/doc
- rm -rf `find $(distdir)/doc -type d -name .svn`
+ rm -rf `find $(distdir)/doc -type d -name RCS`
@end example
@c The caveats described here should be documented in 'disthook.sh'.
@noindent
-Note that the @code{dist-hook} recipe shouldn't assume that the regular
-files in the distribution directory are writable; this might not be the
-case if one is packaging from a read-only source tree, or when a
-@code{make distcheck} is being done. For similar reasons, the recipe
-shouldn't assume that the subdirectories put into the distribution
-directory as an effect of having them listed in @code{EXTRA_DIST} are
-writable. So, if the @code{dist-hook} recipe wants to modify the
-content of an existing file (or @code{EXTRA_DIST} subdirectory) in the
-distribution directory, it should explicitly to make it writable first:
+The @code{dist-hook} recipe should not assume that the regular files
+in the distribution directory are writable; this might not be the case
+if one is packaging from a read-only source tree, or when a @code{make
+distcheck} is being done. Similarly, the recipe should not assume
+that the subdirectories put into the distribution directory as a
+result of being listed in @code{EXTRA_DIST} are writable. So, if the
+@code{dist-hook} recipe wants to modify the content of an existing
+file (or @code{EXTRA_DIST} subdirectory) in the distribution
+directory, it should explicitly to make it writable first:
@example
EXTRA_DIST = README doc
@@ -8634,16 +8690,17 @@ will copy files from the current directory before creating the
tarball. If you are at the top-level directory, then @samp{distdir =
$(PACKAGE)-$(VERSION)}. When used from subdirectory named
@file{foo/}, then @samp{distdir = ../$(PACKAGE)-$(VERSION)/foo}.
-@samp{$(distdir)} can be a relative or absolute path, do not assume
-any form.
+@samp{$(distdir)} can be either a relative or absolute path; do not
+assume a particular form.
@samp{$(top_distdir)} always points to the root directory of the
-distributed tree. At the top-level it's equal to @samp{$(distdir)}.
-In the @file{foo/} subdirectory
-@samp{top_distdir = ../$(PACKAGE)-$(VERSION)}.
-@samp{$(top_distdir)} too can be a relative or absolute path.
+distributed tree. At the top level it's equal to @samp{$(distdir)}.
+In the @file{foo/} subdirectory @samp{top_distdir =
+../$(PACKAGE)-$(VERSION)}. @samp{$(top_distdir)} can also be either a
+relative or absolute path.
-Note that when packages are nested using @code{AC_CONFIG_SUBDIRS}
+@acindex AC_CONFIG_SUBDIRS
+When packages are nested using @code{AC_CONFIG_SUBDIRS}
(@pxref{Subpackages}), then @samp{$(distdir)} and
@samp{$(top_distdir)} are relative to the package where @samp{make
dist} was run, not to any sub-packages involved.
@@ -8833,70 +8890,89 @@ distributions in various formats. Their targets are:
@table @asis
@item @code{dist-gzip}
-Generate a @samp{gzip} tar archive of the distribution. This is the
-only format enabled by default.
@trindex dist-gzip
+@cmindex gzip
+@vindex GZIP_ENV
+Generate a @samp{gzip} tar archive of the distribution. This is the
+only format enabled by default. By default, this rule makes
+@command{gzip} use a compression option of @option{--best}. To make
+it use a different one, set the @env{GZIP_ENV} environment variable.
+For example, @samp{make dist-gzip GZIP_ENV=-7}.
-@vindex BZIP2
@item @code{dist-bzip2}
-Generate a @samp{bzip2} tar archive of the distribution. bzip2 archives
-are frequently smaller than gzipped archives.
-By default, this rule makes @samp{bzip2} use a compression option of @option{-9}.
-To make it use a different one, set the @env{BZIP2} environment variable.
-For example, @samp{make dist-bzip2 BZIP2=-7}.
@trindex dist-bzip2
+@cmindex bzip2
+@vindex BZIP2
+Generate a @samp{bzip2} tar archive of the distribution. bzip2
+archives are usually smaller than gzipped archives. By default, this
+rule makes @samp{bzip2} use a compression option of @option{-9}. To
+make it use a different one, set the @env{BZIP2} environment variable.
@item @code{dist-lzip}
-Generate an @samp{lzip} tar archive of the distribution. @command{lzip}
-archives are frequently smaller than @command{bzip2}-compressed archives.
@trindex dist-lzip
+@cmindex lzip
+@vindex LZIP_OPT
+Generate an @samp{lzip} tar archive of the distribution.
+@command{lzip} archives are usually smaller than
+@command{bzip2}-compressed archives. By default, this rule makes
+@samp{lzip} use a compression option of @option{-9}. To make it use a
+different one, set the @env{LZIP_OPT} environment variable.
-@vindex XZ_OPT
@item @code{dist-xz}
+@trindex dist-xz
+@cmindex xz
+@vindex XZ_OPT
Generate an @samp{xz} tar archive of the distribution. @command{xz}
-archives are frequently smaller than @command{bzip2}-compressed archives.
+archives are usually smaller than @command{bzip2}-compressed archives.
By default, this rule makes @samp{xz} use a compression option of
@option{-e}. To make it use a different one, set the @env{XZ_OPT}
environment variable. For example, run this command to use the
-default compression ratio, but with a progress indicator:
-@samp{make dist-xz XZ_OPT=-ve}.
-@trindex dist-xz
+default compression ratio, but with a progress indicator: @samp{make
+dist-xz XZ_OPT=-ve}.
+@trindex dist-zip
+@cmindex zip
@item @code{dist-zip}
Generate a @samp{zip} archive of the distribution.
-@trindex dist-zip
-@item @code{dist-tarZ}
-Generate a tar archive of the distribution, compressed with the
-historical (and obsolescent) program @command{compress}. This
-option is deprecated, and it and the corresponding functionality
-will be removed altogether in Automake 2.0.
-@trindex dist-tarZ
+@item @code{dist-zstd}
+@trindex dist-zstd
+@cmindex zstd
+@vindex ZSTD_OPT
+@vindex ZSTD_CLEVEL
+Generate a @code{zstd} tar archive of the distribution. By default,
+this rule makes @command{zstd} use a compression option of
+@option{-19}. To use a different setting, set the @env{ZSTD_OPT}
+environment variable. For example, run this command to use the
+default compression ratio, but with a progress indicator: @samp{make
+dist-zstd ZSTD_OPT=-19v}. However, note that for compatibility with
+@command{zstd} itself, you may instead set the @env{ZSTD_CLEVEL}
+environment variable, in which case, any @env{ZSTD_OPT} setting is
+ignored.
@item @code{dist-shar}
+@trindex dist-shar
+@cmindex shar
Generate a @samp{shar} archive of the distribution. This format
archive is obsolescent, and use of this option is deprecated.
It and the corresponding functionality will be removed altogether
in Automake 2.0.
-@trindex dist-shar
-@vindex ZSTD_OPT
-@vindex ZSTD_CLEVEL
-@item @code{dist-zstd}
-Generate a @samp{zstd} tar archive of the distribution. By default, this
-rule makes @samp{zstd} use a compression option of @option{-19}. To
-make it use a different one, set the @env{ZSTD_OPT} environment variable.
-For example, run this command to use the default compression ratio,
-but with a progress indicator: @samp{make dist-zstd ZSTD_OPT=-19v}.
-However, note that for compatibility with zstd itself, you may instead set the @env{ZSTD_CLEVEL} environment variable, in which case, any @env{ZSTD_OPT} setting is ignored.
-@trindex dist-zstd
+@item @code{dist-tarZ}
+@trindex dist-tarZ
+@cmindex compress
+Generate a tar archive of the distribution, compressed with the
+historical (and obsolescent) program @command{compress}. This
+option is deprecated, and it and the corresponding functionality
+will be removed altogether in Automake 2.0.
@end table
+@trindex dist-all
The rule @code{dist} (and its historical synonym @code{dist-all})
will create archives in all the enabled formats (@pxref{List of
Automake options} for how to change this list). By default, only
-the @code{dist-gzip} target is hooked to @code{dist}.
+the @code{dist-gzip} target is enabled by @code{dist}.
@node Tests
@@ -8961,13 +9037,13 @@ determine that such condition of behaviour does @emph{not} hold.
@cindex test skip
Sometimes, tests can rely on non-portable tools or prerequisites, or
simply make no sense on a given system (for example, a test checking a
-Windows-specific feature makes no sense on a GNU/Linux system). In this
-case, accordingly to the definition above, the tests can neither be
-considered passed nor failed; instead, they are @emph{skipped}- --i.e.,
-they are not run, or their result is anyway ignored for what concerns
-the count of failures and successes. Skips are usually explicitly
-reported though, so that the user will be aware that not all of the
-testsuite has really run.
+Windows-specific feature makes no sense on a GNU/Linux system). In
+this case, accordingly to the definition above, the tests can neither
+be considered passed nor failed; instead, they are @emph{skipped},
+that is, they are not run, or their result is in any case ignored for
+what concerns the count of failures and successes. Skips are usually
+explicitly reported though, so that the user will be aware that not
+all of the testsuite has been run.
@cindex xfail
@cindex expected failure
@@ -9232,9 +9308,9 @@ provides a more elegant way to achieve the same effect, with the further
benefit of freeing the @code{TESTS_ENVIRONMENT} variable for the user
(@pxref{Parallel Test Harness}).
-Another, less serious limitation of the serial harness is that it doesn't
-really distinguish between simple failures and hard errors; this is
-due to historical reasons only, and might be fixed in future Automake
+Another, less serious limitation of the serial harness is that it
+doesn't distinguish between simple failures and hard errors; this is
+for historical reasons, and might be fixed in future Automake
versions.
@node Parallel Test Harness
@@ -9372,7 +9448,19 @@ command like this to run only a subset of the tests:
env TESTS="foo.test bar.test" make -e check
@end example
-Note however that the command above will unconditionally overwrite the
+@c https://bugs.gnu.org/42883
+If you're using a recursive make setup, you'll probably also need to
+override @code{SUBDIRS}:
+
+@example
+env TESTS="foo.test bar.test" make -e check SUBDIRS=
+@end example
+
+Otherwise, the test harness will descend into all subdirectories,
+where the tests presumably do not exist, and thus fail. (Patch to
+provide better behavior would be welcome.)
+
+Another issue: the command above will unconditionally overwrite the
@file{test-suite.log} file, thus clobbering the recorded results
of any previous testsuite run. This might be undesirable for packages
whose testsuite takes a long time to execute. Luckily, this problem can
@@ -9553,8 +9641,8 @@ On the other hand, the exact semantics of how (and if) testsuite output
colorization, @code{XFAIL_TESTS}, and hard errors are supported and
handled is left to the individual test drivers.
-@c TODO: We should really add a working example in the doc/ directory,
-@c TODO: and reference if from here.
+@c TODO: We should add a working example in the doc/ directory,
+@c TODO: and reference it from here.
@node Declaring Custom Test Drivers
@subsection Declaring Custom Test Drivers
@@ -9579,7 +9667,7 @@ are @emph{not} a substitute for the @code{LOG_COMPILER} variables: the
two sets of variables can, and often do, usefully and legitimately
coexist.
-@c TODO: We should really be able to point to a clarifying example here!
+@c TODO: We should point to a clarifying example here!
The developer-reserved variable @code{AM_LOG_DRIVER_FLAGS} and the
user-reserved variable @code{LOG_DRIVER_FLAGS} can be used to define
@@ -9594,10 +9682,10 @@ invocations of @code{@var{ext}_LOG_DRIVER}.
@node API for Custom Test Drivers
@subsection API for Custom Test Drivers
-Note that @emph{the APIs described here are still highly experimental},
-and will very likely undergo tightenings and likely also extensive changes
-in the future, to accommodate for new features or to satisfy additional
-portability requirements.
+Note that @emph{the APIs described here are still highly
+experimental}, and will very likely undergo tightening and possibly
+extensive changes in the future, to accommodate for new features or to
+satisfy additional portability requirements.
The main characteristic of these APIs is that they are designed to share
as much infrastructure, semantics, and implementation detail as possible
@@ -10180,6 +10268,15 @@ the file automatically. An inconvenience is that @command{autoconf}
will now be rerun each time the version number is bumped, when only
@file{configure} had to be rerun in the previous setup.
+@opindex --always-make @r{GNU Make option}
+GNU Make, at least, has an option @option{--always-make} which tells
+Make to consider that all targets are out of date. This interacts
+badly with Automake-generated Makefiles, which implement their own
+careful rules for when to regenerate Makefiles, as described above.
+The result is an endless loop, or other poor behavior. The only thing
+to do, as far as we know, is to refrain from using
+@option{--always-make}.
+
@node Options
@chapter Changing Automake's Behavior
@@ -10360,6 +10457,21 @@ disable automatic dependency tracking.
Don't emit any code related to @code{dist} target. This is useful
when a package has its own method for making distributions.
+@item @option{no-dist-built-sources}
+@cindex Option, @option{no-dist-built-sources}
+@opindex no-dist-built-sources
+@cindex @command{help2man}, and @samp{dist} target
+@vindex BUILT_SOURCES, and @samp{dist} target
+Don't build @code{BUILT_SOURCES} as part of @code{dist}. This option
+can be set if building the distribution only requires the source
+files, and doesn't compile anything as a side-effect. The default is
+for @samp{$(distdir)} to depend on @samp{$(BUILT_SOURCES)} because it
+is common, at least among GNU packages, to want to build the program
+to generate man pages with @code{help2man} (@pxref{Errors with
+distclean}). Admittedly the default behavior should perhaps be to
+omit the dependency, but to preserve compatibility, we don't want to
+change it now.
+
@item @option{no-dist-gzip}
@cindex Option, @option{no-dist-gzip}
@opindex no-dist-gzip
@@ -10471,7 +10583,7 @@ If this option is specified, then objects are placed into the
subdirectory of the build directory corresponding to the subdirectory of
the source file. For instance, if the source file is
@file{subdir/file.cxx}, then the output file would be
-@file{subdir/file.o}.
+@file{subdir/file.o}. @xref{Program and Library Variables}.
@anchor{tar-formats}
@item @option{tar-v7}
@@ -10585,10 +10697,10 @@ GNU Emacs under some circumstances.
If any C, C++ or Fortran 77 source code or headers are present, then
@code{tags} and @code{TAGS} rules will be generated for the directory.
All files listed using the @code{_SOURCES}, @code{_HEADERS}, and
-@code{_LISP} primaries will be used to generate tags. Note that
-generated source files that are not distributed must be declared in
-variables like @code{nodist_noinst_HEADERS} or
-@code{nodist_@var{prog}_SOURCES} or they will be ignored.
+@code{_LISP} primaries will be used to generate tags. Generated
+source files that are not distributed must be declared in variables
+like @code{nodist_noinst_HEADERS} or @code{nodist_@var{prog}_SOURCES}
+or they will be ignored.
A @code{tags} rule will be output at the topmost directory of a
multi-directory package. When run from this topmost directory,
@@ -10600,10 +10712,12 @@ The @code{tags} rule will also be generated if the variable
directories that contain taggable source that @command{etags} does
not understand. The user can use the @code{ETAGSFLAGS} to pass
additional flags to @command{etags}; @code{AM_ETAGSFLAGS} is also
-available for use in @file{Makefile.am}.
+available for use in @file{Makefile.am}. The variable @code{ETAGS}
+is the name of the program to invoke (by default @command{etags}).
@vindex ETAGS_ARGS
@vindex ETAGSFLAGS
@vindex AM_ETAGSFLAGS
+@vindex ETAGS
Here is how Automake generates tags for its source, and for nodes in its
Texinfo file:
@@ -10623,6 +10737,9 @@ build @command{vi}-style @file{tags} files. The variable @code{CTAGS}
is the name of the program to invoke (by default @command{ctags});
@code{CTAGSFLAGS} can be used by the user to pass additional flags,
and @code{AM_CTAGSFLAGS} can be used by the @file{Makefile.am}.
+@vindex CTAGS_ARGS
+@vindex CTAGSFLAGS
+@vindex CTAGS
@trindex id
Automake will also generate an @code{ID} rule that will run
@@ -10640,6 +10757,9 @@ file names respectively, while @code{AM_CSCOPEFLAGS} can be used by the
with non-GNU make implementations (especially with make implementations
performing @ref{Automatic Rule Rewriting, , VPATH rewrites, autoconf,
The Autoconf Manual}).
+@vindex CSCOPE_ARGS
+@vindex CSCOPEFLAGS
+@vindex CSCOPE
Finally, Automake also emits rules to support the
@uref{https://www.gnu.org/software/global/, GNU Global Tags program}.
@@ -10970,7 +11090,7 @@ verbose output from @command{make} ends up being mostly noise that hampers
the easy detection of potentially important warning messages.
@node Tricks For Silencing Make
-@section Standard and generic ways to silence make
+@section Standard and generic ways to silence Make
Here we describe some common idioms/tricks to obtain a quieter make
output, with their relative advantages and drawbacks. In the next
@@ -11028,7 +11148,7 @@ automatically activated if the @option{-s} flag is used.
@end itemize
@node Automake Silent Rules
-@section How Automake can help in silencing make
+@section How Automake can help in silencing Make
The tricks and idioms for silencing @command{make} described in the
previous section can be useful from time to time, but we've seen that
@@ -11068,7 +11188,7 @@ func.c:4:3: warning: ‘i’ used uninitialized in this function
mv -f .deps/func.Tpo .deps/func.Po
gcc -Wall -o foo main.o func.o
-@i{Clean up, so that we we can rebuild everything from scratch.}
+@i{Clean up, so that we can rebuild everything from scratch.}
% @kbd{make clean}
test -z "foo" || rm -f foo
rm -f *.o
@@ -11136,9 +11256,9 @@ enable them explicitly at either @command{configure} run time or at
it provides the casual user with enough information to prepare a good
bug report in case anything breaks.
-Still, notwithstanding the rationales above, a developer who really
-wants to make silent rules enabled by default in his own package can
-do so by calling @code{AM_SILENT_RULES([yes])} in @file{configure.ac}.
+Still, notwithstanding the rationales above, developers who wants to
+make silent rules enabled by default in their own packages can do so
+by calling @code{AM_SILENT_RULES([yes])} in @file{configure.ac}.
@c Keep in sync with silent-configsite.sh
Users who prefer to have silent rules enabled by default can edit their
@@ -11146,7 +11266,7 @@ Users who prefer to have silent rules enabled by default can edit their
default to @samp{yes}. This should still allow disabling silent rules
at @command{configure} time and at @command{make} time.
-@c FIXME: there's really a need to specify this explicitly?
+@c FIXME: is there a need to specify this explicitly?
For portability to different @command{make} implementations, package authors
are advised to not set the variable @code{V} inside the @file{Makefile.am}
file, to allow the user to override the value for subdirectories as well.
@@ -11530,7 +11650,7 @@ they support VPATH builds (@pxref{VPATH Builds}). Obviously if the
subpackage does not support VPATH builds the whole package will not
support VPATH builds. This in turns means that @samp{make distcheck}
will not work, because it relies on VPATH builds. Some people can
-live without this (actually, many Automake users have never heard of
+live without this (indeed, many Automake users have never heard of
@samp{make distcheck}). Other people may prefer to revamp the
existing @file{Makefile}s to support VPATH@. Doing so does not
necessarily require Automake; only Autoconf is needed (@pxref{Build
@@ -11548,17 +11668,17 @@ keep the third-party sources untouched to ease upgrades to new
versions.
@cindex @file{GNUmakefile} including @file{Makefile}
-Here are two other ideas. If GNU make is assumed, one possibility is
+Here are two other ideas. If GNU Make is assumed, one possibility is
to add to that subdirectory a @file{GNUmakefile} that defines the
required targets and includes the third-party @file{Makefile}. For
this to work in VPATH builds, @file{GNUmakefile} must lie in the build
directory; the easiest way to do this is to write a
@file{GNUmakefile.in} instead, and have it processed with
-@code{AC_CONFIG_FILES} from the outer package. For example if we
+@code{AC_CONFIG_FILES} from the outer package. For example, if we
assume @file{Makefile} defines all targets except the documentation
-targets, and that the @code{check} target is actually called
-@code{test}, we could write @file{GNUmakefile} (or
-@file{GNUmakefile.in}) like this:
+targets, and that the real @code{check} target is named @code{test},
+we could write @file{GNUmakefile} (or @file{GNUmakefile.in}) like
+this:
@example
# First, include the real Makefile
@@ -11937,11 +12057,11 @@ But, after all, CVS's job is versioning, not distribution.
Allowing developers to use different versions of their tools can also
hide bugs during distributed development. Indeed, developers will be
using (hence testing) their own generated files, instead of the
-generated files that will be actually released. The developer who
-prepares the tarball might be using a version of the tool that
-produces bogus output (for instance a non-portable C file), something
-other developers could have noticed if they weren't using their own
-versions of this tool.
+generated files that will be released. The developer who prepares the
+tarball might be using a version of the tool that produces bogus
+output (for instance a non-portable C file), something other
+developers could have noticed if they weren't using their own versions
+of this tool.
@subheading Third-party Files
@cindex CVS and third-party files
@@ -11998,12 +12118,12 @@ the build continue is one of the arguments of the
@code{AM_MAINTAINER_MODE} allows you to choose whether the so called
"rebuild rules" should be enabled or disabled. With
@code{AM_MAINTAINER_MODE([enable])}, they are enabled by default;
-otherwise they are disabled by default. In the latter case, if
-you have @code{AM_MAINTAINER_MODE} in @file{configure.ac}, and run
-@samp{./configure && make}, then @command{make} will *never* attempt to
-rebuild @file{configure}, @file{Makefile.in}s, Lex or Yacc outputs, etc.
-I.e., this disables build rules for files that are usually distributed
-and that users should normally not have to update.
+otherwise they are disabled by default. In the latter case, if you
+have @code{AM_MAINTAINER_MODE} in @file{configure.ac}, and run
+@samp{./configure && make}, then @command{make} will *never* attempt
+to rebuild @file{configure}, @file{Makefile.in}s, Lex or Yacc outputs,
+etc. That is, this disables build rules for files that are usually
+distributed and that users should normally not have to update.
The user can override the default setting by passing either
@samp{--enable-maintainer-mode} or @samp{--disable-maintainer-mode}
@@ -12080,9 +12200,9 @@ e.g., NetBSD @command{make} will not expand globs such as @samp{*} in
prerequisites of a target.
@item
-Finally, it's really hard to @emph{forget} to add a file to
-@file{Makefile.am}: files that are not listed in @file{Makefile.am} are
-not compiled or installed, so you can't even test them.
+Finally, it's quite hard to @emph{forget} to add a file to
+@file{Makefile.am}: files that are not listed in @file{Makefile.am}
+are not compiled or installed, so you can't even test them.
@end itemize
Still, these are philosophical objections, and as such you may disagree,
@@ -12201,7 +12321,7 @@ package (@pxref{VPATH Builds}), and then call @samp{make distclean}.
Files left in the build directory after @samp{make distclean} has run
are listed after this error.
-This diagnostic really covers two kinds of errors:
+This diagnostic covers two kinds of errors:
@itemize @bullet
@item
@@ -12389,17 +12509,17 @@ flags, not appended.
@cindex @code{YFLAGS} and @code{AM_YFLAGS}
This section attempts to answer all the above questions. We will
-mostly discuss @code{CPPFLAGS} in our examples, but actually the
-answer holds for all the compile flags used in Automake:
-@code{CCASFLAGS}, @code{CFLAGS}, @code{CPPFLAGS}, @code{CXXFLAGS},
-@code{FCFLAGS}, @code{FFLAGS}, @code{GCJFLAGS}, @code{LDFLAGS},
-@code{LFLAGS}, @code{LIBTOOLFLAGS}, @code{OBJCFLAGS}, @code{OBJCXXFLAGS},
+mostly discuss @code{CPPFLAGS} in our examples, but the answer holds
+for all the compile flags used in Automake: @code{CCASFLAGS},
+@code{CFLAGS}, @code{CPPFLAGS}, @code{CXXFLAGS}, @code{FCFLAGS},
+@code{FFLAGS}, @code{GCJFLAGS}, @code{LDFLAGS}, @code{LFLAGS},
+@code{LIBTOOLFLAGS}, @code{OBJCFLAGS}, @code{OBJCXXFLAGS},
@code{RFLAGS}, @code{UPCFLAGS}, and @code{YFLAGS}.
@code{CPPFLAGS}, @code{AM_CPPFLAGS}, and @code{mumble_CPPFLAGS} are
-three variables that can be used to pass flags to the C preprocessor
-(actually these variables are also used for other languages like C++
-or preprocessed Fortran). @code{CPPFLAGS} is the user variable
+three variables that can be used to pass flags to the C preprocessor (
+these variables are also used for other languages like C++ or
+preprocessed Fortran). @code{CPPFLAGS} is the user variable
(@pxref{User Variables}), @code{AM_CPPFLAGS} is the Automake variable,
and @code{mumble_CPPFLAGS} is the variable specific to the
@code{mumble} target (we call this a per-target variable,
@@ -12446,8 +12566,8 @@ and this flag would be propagated to the compile rules of all
It is also not uncommon to override a user variable at
@command{make}-time. Many installers do this with @code{prefix}, but
-this can be useful with compiler flags too. For instance, if, while
-debugging a C++ project, you need to disable optimization in one
+this can be useful with compiler flags too. For instance, while
+debugging a C++ project, if you need to disable optimization in one
specific object file, you can run something like
@example
@@ -12457,16 +12577,21 @@ make
@end example
The reason @samp{$(CPPFLAGS)} appears after @samp{$(AM_CPPFLAGS)} or
-@samp{$(mumble_CPPFLAGS)} in the compile command is that users
-should always have the last say. It probably makes more sense if you
-think about it while looking at the @samp{CXXFLAGS=-O0} above, which
-should supersede any other switch from @code{AM_CXXFLAGS} or
-@code{mumble_CXXFLAGS} (and this of course replaces the previous value
-of @code{CXXFLAGS}).
+@samp{$(mumble_CPPFLAGS)} in the compile command is that users should
+have the last say. In the example above, the desire is for the
+@samp{CXXFLAGS=-O0} to supersede any other switch from
+@code{AM_CXXFLAGS} or @code{mumble_CXXFLAGS}.
+
+@c https://bugs.gnu.org/35526
+It's true that not all options to all programs can be overridden. So
+in general, users could conceivably want to place options at arbitrary
+places in the command line, but Automake does not support this. It
+would be difficult to make such generality comprehensible. Being able
+to specify the final options commonly suffices.
-You should never redefine a user variable such as @code{CPPFLAGS} in
-@file{Makefile.am}. Use @samp{automake -Woverride} to diagnose such
-mistakes. Even something like
+Thus, you should never redefine a user variable such as
+@code{CPPFLAGS} in @file{Makefile.am}. Use @samp{automake -Woverride}
+to diagnose such mistakes. Even something like
@example
CPPFLAGS = -DDATADIR=\"$(datadir)\" @@CPPFLAGS@@
@@ -12490,9 +12615,9 @@ You should not add options to these user variables within
to modify these variables to perform a test, but you should reset
their values afterwards. In contrast, it is OK to modify the
@samp{AM_} variables within @file{configure} if you @code{AC_SUBST}
-them, but it is rather rare that you need to do this, unless you
-really want to change the default definitions of the @samp{AM_}
-variables in all @file{Makefile}s.
+them, but it is rather rare that you need to do this, unless you want
+to change the default definitions of the @samp{AM_} variables in all
+@file{Makefile}s.
What we recommend is that you define extra flags in separate
variables. For instance, you may write an Autoconf macro that computes
@@ -12531,7 +12656,7 @@ users.
Finally, we have avoided naming the variable of the example
@code{LIBFOO_LDFLAGS} (with an underscore) because that would cause
-Automake to think that this is actually a per-target variable (like
+Automake to think that this is a per-target variable (like
@code{mumble_LDFLAGS}) for some non-declared @code{LIBFOO} target.
@subheading Other Variables
@@ -12539,8 +12664,8 @@ Automake to think that this is actually a per-target variable (like
There are other variables in Automake that follow similar principles
to allow user options. For instance, Texinfo rules (@pxref{Texinfo})
use @code{MAKEINFOFLAGS} and @code{AM_MAKEINFOFLAGS}. Similarly,
-DejaGnu tests (@pxref{DejaGnu Tests}) use @code{RUNTESTDEFAULTFLAGS} and
-@code{AM_RUNTESTDEFAULTFLAGS}. The tags and ctags rules
+DejaGnu tests (@pxref{DejaGnu Tests}) use @code{RUNTESTFLAGS} and
+@code{AM_RUNTESTFLAGS}. The tags and ctags rules
(@pxref{Tags}) use @code{ETAGSFLAGS}, @code{AM_ETAGSFLAGS},
@code{CTAGSFLAGS}, and @code{AM_CTAGSFLAGS}. Java rules
(@pxref{Java}) use @code{JAVACFLAGS} and @code{AM_JAVACFLAGS}. None
@@ -12586,10 +12711,9 @@ cannot be built with both @samp{-DEXIT_CODE=0} @emph{and}
build two different objects: @file{true-generic.o} and
@file{false-generic.o}.
-@command{automake} doesn't actually look whether source files are
-shared to decide if it must rename objects. It will just rename all
-objects of a target as soon as it sees per-target compilation flags
-used.
+Automake doesn't actually determine whether source files are shared to
+decide if it must rename objects. It just renames all objects of a
+target as soon as it sees that per-target compilation flags are used.
It's OK to share object files when per-target compilation flags are not
used. For instance, @file{true} and @file{false} will both use
@@ -12700,9 +12824,9 @@ data.c data.h: data.foo
@end example
@noindent
-What the above rule really says is that @file{data.c} and
-@file{data.h} each depend on @file{data.foo}, and can each be built by
-running @samp{foo data.foo}. In other words it is equivalent to:
+What the above rule says is that @file{data.c} and @file{data.h} each
+depend on @file{data.foo}, and can each be built by running @samp{foo
+data.foo}. In other words it is equivalent to:
@example
# We do not want this.
@@ -12843,10 +12967,10 @@ that @file{data.h} is created before @file{data.c}. Then we have a
weird situation. The next time @command{make} is run, @file{data.h}
will appear older than @file{data.c}, the second rule will be
triggered, a shell will be started to execute the @samp{if@dots{}fi}
-command, but actually it will just execute the @code{then} branch,
-that is: nothing. In other words, because the witness we selected is
-not the first file created by @command{foo}, @command{make} will start
-a shell to do nothing each time it is run.
+command, but it will just execute the @code{then} branch, that is:
+nothing. In other words, because the witness we selected is not the
+first file created by @command{foo}, @command{make} will start a shell
+to do nothing each time it is run.
A simple riposte is to fix the timestamps when this happens.
@@ -13036,12 +13160,11 @@ directory in @file{configure}, but if I install files therein,
These two setups share their symptoms: @samp{make distcheck} fails
because they are installing files to hard-coded paths. In the latter
-case the path is not really hard-coded in the package, but we can
-consider it to be hard-coded in the system (or in whichever tool that
-supplies the path). As long as the path does not use any of the
-standard directory variables (@samp{$(prefix)}, @samp{$(bindir)},
-@samp{$(datadir)}, etc.), the effect will be the same:
-user-installations are impossible.
+case the path is not hard-coded in the package, but we can consider it
+to be hard-coded in the system (or in whichever tool that supplies the
+path). As long as the path does not use any of the standard directory
+variables (@samp{$(prefix)}, @samp{$(bindir)}, @samp{$(datadir)},
+etc.), the effect will be the same: user-installations are impossible.
As a (non-root) user who wants to install a package, you usually have no
right to install anything in @file{/usr} or @file{/usr/local}. So you
@@ -13087,8 +13210,8 @@ non-root users will not be able to install the package; hence
distcheck fails.
Let's do better. The @samp{sysconfig.get_python_lib()} function
-actually accepts a third argument that will replace Python's
-installation prefix.
+accepts a third argument that will replace Python's installation
+prefix.
@example
% @kbd{python -c 'from distutils import sysconfig;
@@ -13135,14 +13258,14 @@ lispdir=`sed -n
conftest.out`
@end example
-I.e., it just picks the first directory that looks like
+That is, it just picks the first directory that looks like
@file{*/lib/*emacs/site-lisp} or @file{*/share/*emacs/site-lisp} in
the search path of emacs, and then substitutes @samp{$@{libdir@}} or
@samp{$@{datadir@}} appropriately.
The emacs case looks complicated because it processes a list and
-expects two possible layouts; otherwise it's easy, and the benefits for
-non-root users are really worth the extra @command{sed} invocation.
+expects two possible layouts; otherwise it's easy, and the benefits
+for non-root users are worth the extra @command{sed} invocation.
@node Debugging Make Rules
@@ -13162,29 +13285,33 @@ generated by @command{automake} effectively:
If less verbose output has been enabled in the package with the use
of silent rules (@pxref{Automake Silent Rules}), you can use
@code{make V=1} to see the commands being executed.
+
@item
@code{make -n} can help show what would be done without actually doing
-it. Note however, that this will @emph{still execute} commands prefixed
-with @samp{+}, and, when using GNU @command{make}, commands that contain
+it. However, this @emph{still executes} commands prefixed with
+@samp{+}, and, when using GNU @command{make}, commands that contain
the strings @samp{$(MAKE)} or @samp{$@{MAKE@}} (@pxref{Instead of
-Execution,,, make, The GNU Make Manual}).
-Typically, this is helpful to show what recursive rules would do, but it
-means that, in your own rules, you should not mix such recursion with
-actions that change any files.@footnote{Automake's @samp{dist} and
-@samp{distcheck} rules had a bug in this regard in that they created
-directories even with @option{-n}, but this has been fixed in Automake
-1.11.} Furthermore, note that GNU @command{make} will update
-prerequisites for the @file{Makefile} file itself even with @option{-n}
-(@pxref{Remaking Makefiles,,, make, The GNU Make Manual}).
+Execution,,, make, The GNU Make Manual}). Typically, this is helpful
+to show what recursive rules would do, but it means that, in your own
+rules, you should not mix such recursion with actions that change any
+files.@footnote{Automake's @samp{dist} and @samp{distcheck} rules had
+a bug in this regard in that they created directories even with
+@option{-n}, but this has been fixed in Automake 1.11.} Furthermore,
+note that GNU @command{make} will update prerequisites for the
+@file{Makefile} file itself even with @option{-n} (@pxref{Remaking
+Makefiles,,, make, The GNU Make Manual}).
+
@item
@code{make SHELL="/bin/bash -vx"} can help debug complex rules.
@xref{The Make Macro SHELL,,, autoconf, The Autoconf Manual}, for some
portability quirks associated with this construct.
+
@item
@code{echo 'print: ; @@echo "$(VAR)"' | make -f Makefile -f - print}
can be handy to examine the expanded value of variables. You may need
to use a target other than @samp{print} if that is already used or a
file with that name exists.
+
@item
@url{http://bashdb.sourceforge.net/@/remake/} provides a modified
GNU @command{make} command called @command{remake} that copes with
@@ -13197,38 +13324,37 @@ a debugger.
@node Reporting Bugs
@section Reporting Bugs
-Most nontrivial software has bugs. Automake is no exception. Although
-we cannot promise we can or will fix a bug, and we might not even agree
-that it is a bug, we want to hear about problems you encounter. Often we
-agree they are bugs and want to fix them.
+@cindex Bugs, reporting
+@cindex Reporting bugs
-To make it possible for us to fix a bug, please report it. In order to
-do so effectively, it helps to know when and how to do it.
+Most nontrivial software has bugs. Automake is no exception. We
+cannot promise we can or will fix a bug, and we might not even agree
+that it is a bug, but we want to hear about problems you
+encounter. Often we agree they are bugs and want to fix them.
-Before reporting a bug, it is a good idea to see if it is already known.
+So, to make it possible for us to fix a bug, please report it.
+If you can, though, it is helpful if you check if it is already known.
You can look at the @uref{https://debbugs.gnu.org/, GNU Bug Tracker}
and the @uref{https://lists.gnu.org/@/archive/@/html/@/bug-automake/,
-bug-automake mailing list archives} for previous bug reports. We
+bug-automake mailing list archives} for previous bug reports. (We
previously used a Gnats database for bug tracking, but it is no longer
-online.
+online.)
-If the bug is not already known, it should be reported. It is very
-important to report bugs in a way that is useful and efficient. For
-this, please familiarize yourself with
-@uref{https://www.chiark.greenend.org.uk/@/~sgtatham/@/bugs.html, How to
-Report Bugs Effectively} and
+If the bug is not already known, it should be reported. To report
+bugs in a way that is useful and efficient, please read
+@uref{https://www.chiark.greenend.org.uk/@/~sgtatham/@/bugs.html, How
+to Report Bugs Effectively} and
@uref{http://catb.org/@/~esr/@/faqs/@/smart-questions.html, How to Ask
-Questions the Smart Way}. This helps you and developers to save time,
-which can then be spent on fixing more bugs and implementing more
-features.
+Questions the Smart Way}. Good bug reports save time for everyone.
For a bug report, a feature request or other suggestions, please send
email to @email{@value{PACKAGE_BUGREPORT}}. This will then open a new
bug in the @uref{https://debbugs.gnu.org/@/automake, bug tracker}. Be
-sure to include the versions of Autoconf and Automake that you use.
-Ideally, post a minimal @file{Makefile.am} and @file{configure.ac} that
-reproduces the problem you encounter. If you have encountered test
-suite failures, please attach the @file{test-suite.log} file.
+sure to include the versions of Autoconf and Automake that you use and
+the kind of system you're on. Ideally, post a minimal
+@file{Makefile.am} and @file{configure.ac} that reproduces the problem
+you encounter. If you have encountered test suite failures, please
+attach the @file{test-suite.log} file.
@c ========================================================== Appendices
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 542edaad2..82aa001de 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,7 +5,7 @@
@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2000--2021 Free Software Foundation, Inc.
@uref{https://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
diff --git a/doc/help2man b/doc/help2man
index d20afdb45..db8bedf3f 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/doc/local.mk b/doc/local.mk
index 5ba0c0038..7bd1f3907 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 342351fd8..583ef9568 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 19 November 2020
-@set UPDATED-MONTH November 2020
-@set EDITION 1.16.3
-@set VERSION 1.16.3
+@set UPDATED 16 July 2021
+@set UPDATED-MONTH July 2021
+@set EDITION 1.16.4
+@set VERSION 1.16.4
diff --git a/doc/version.texi b/doc/version.texi
index 342351fd8..583ef9568 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 19 November 2020
-@set UPDATED-MONTH November 2020
-@set EDITION 1.16.3
-@set VERSION 1.16.3
+@set UPDATED 16 July 2021
+@set UPDATED-MONTH July 2021
+@set EDITION 1.16.4
+@set VERSION 1.16.4
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 2e3d95bed..5c8810308 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -3,7 +3,7 @@
# of the Automake testsuite. Also, automatically generate some more
# tests from them (for particular cases/setups only).
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index e9aaf2f80..c53cfb03f 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 02f03f8ff..5e1f30a9f 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 437a5c7a6..71e5c85cb 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index d44e0ab94..d529f1b99 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -1,5 +1,5 @@
# -*- Perl -*-
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
# @configure_input@
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index bc501b18e..0bbce0312 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 164e48810..c06165de2 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 028516584..d66386a9f 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index 59efd21b9..93022b57e 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index d5910ab26..f717dd46d 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index aee23e778..f307f65a2 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 995fb11eb..1d14feb4d 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index b85e0fa54..f8425839b 100644
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 611cd0220..3272418d6 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index b846fee87..228163367 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -283,6 +283,7 @@ sub _is_valid_easy_option ($)
no-define
no-dependencies
no-dist
+ no-dist-built-sources
no-dist-gzip
no-exeext
no-installinfo
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 5336422ee..8220f041b 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 73929da21..54326510d 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 3bde2e1a8..a56624922 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 32db93698..4227baad9 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 16cdfb699..4e6d050c9 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 639996da1..7abd75c2c 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index d0cf32cd4..1db768b61 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/lib/Automake/local.mk b/lib/Automake/local.mk
index a117c71a6..9a9bacdd3 100644
--- a/lib/Automake/local.mk
+++ b/lib/Automake/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/lib/INSTALL b/lib/INSTALL
index 8865734f8..e82fd21de 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
- Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX 'make' updates targets which have the same time stamps as their
+ HP-UX 'make' updates targets which have the same timestamps as their
prerequisites, which makes it generally unusable when shipped generated
files such as 'configure' are involved. Use GNU 'make' instead.
diff --git a/lib/am/check.am b/lib/am/check.am
index 449708742..3208d1e6b 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/lib/am/check2.am b/lib/am/check2.am
index d874b8034..ca4f6de71 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008-2020 Free Software Foundation, Inc.
+## Copyright (C) 2008-2021 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
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 64c1fbc04..622b25c2a 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/clean.am b/lib/am/clean.am
index b9793cfca..1da405561 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/compile.am b/lib/am/compile.am
index 5fd17c94f..7b9617409 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/configure.am b/lib/am/configure.am
index f207c94da..61d37787e 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/lib/am/data.am b/lib/am/data.am
index 01f2ce870..4f4331e08 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 6fa42c6b4..8b5c1af49 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/depend.am b/lib/am/depend.am
index b28c27d61..9278487a4 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 4204c4449..0b88a48e0 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 774d08b91..9bd302804 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
@@ -75,8 +75,13 @@ if %?SUBDIRS%
AM_RECURSIVE_TARGETS += distdir distdir-am
endif %?SUBDIRS%
+if %?DIST_BUILT_SOURCES%
+distdir:
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+else !%?DIST_BUILT_SOURCES%
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+endif !%?DIST_BUILT_SOURCES%
distdir-am: $(DISTFILES)
##
diff --git a/lib/am/footer.am b/lib/am/footer.am
index 5aa0423b3..2fcef9873 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 520988609..f4a0102d2 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/header.am b/lib/am/header.am
index 887612e52..0bfbb56d1 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index c0396ef9b..fe1708f50 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2004-2020 Free Software Foundation, Inc.
+## Copyright (C) 2004-2021 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
diff --git a/lib/am/install.am b/lib/am/install.am
index 8066def14..7bbc102a7 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/lib/am/java.am b/lib/am/java.am
index 768ab5caa..b95f65daa 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2020 Free Software Foundation, Inc.
+## Copyright (C) 1998-2021 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
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 7288267fc..346e84127 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/lib/am/lex.am b/lib/am/lex.am
index c3604b1bb..cdcf563ff 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2020 Free Software Foundation, Inc.
+## Copyright (C) 2001-2021 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
diff --git a/lib/am/library.am b/lib/am/library.am
index f5efc99fc..10b5364cf 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 06a904235..3805c1d85 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index e9b1bd101..51a978a4b 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 705181ca1..6029ee343 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1996-2020 Free Software Foundation, Inc.
+## Copyright (C) 1996-2021 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
diff --git a/lib/am/local.mk b/lib/am/local.mk
index 4070c36a1..8e554b8ce 100644
--- a/lib/am/local.mk
+++ b/lib/am/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 5608940b1..a19473e2d 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index 5e5f6ca5b..a89f5ffa7 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index 6b5e0d214..6d3d3cf9e 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/mans.am b/lib/am/mans.am
index cd2327888..a20972044 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2020 Free Software Foundation, Inc.
+## Copyright (C) 1998-2021 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
diff --git a/lib/am/program.am b/lib/am/program.am
index 9a243b399..9d78546bf 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 79704c15a..29ae651d0 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/python.am b/lib/am/python.am
index 6346a7e5f..a69dd8165 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999-2020 Free Software Foundation, Inc.
+## Copyright (C) 1999-2021 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
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 775ef52de..0d9f4cd8b 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 794df03fe..845d3499e 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 55e7ef641..fe3f29757 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/tags.am b/lib/am/tags.am
index a485ff840..b2fc6fe2d 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
@@ -45,7 +45,6 @@ ID: $(am__tagged_files)
## TAGS. ##
## ------ ##
-ETAGS = etags
.PHONY: TAGS tags
if %?SUBDIRS%
AM_RECURSIVE_TARGETS += TAGS
@@ -101,7 +100,6 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
## vi-style tags. ##
## --------------- ##
-CTAGS = ctags
.PHONY: CTAGS ctags
if %?SUBDIRS%
AM_RECURSIVE_TARGETS += CTAGS
@@ -136,7 +134,6 @@ GTAGS:
## ------- ##
if %?TOPDIR_P%
-CSCOPE = cscope
.PHONY: cscope clean-cscope
AM_RECURSIVE_TARGETS += cscope
cscope: cscope.files
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 6803bd151..b2d308109 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 0c5e539a4..fdccf66e5 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index e9f7bb9fc..4cb8af746 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2020 Free Software Foundation, Inc.
+## Copyright (C) 1994-2021 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
diff --git a/lib/am/vala.am b/lib/am/vala.am
index 81666a7cc..980ac1fc1 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008-2020 Free Software Foundation, Inc.
+## Copyright (C) 2008-2021 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
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 1d76cb6ef..8d832114f 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2020 Free Software Foundation, Inc.
+## Copyright (C) 1998-2021 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
diff --git a/lib/ar-lib b/lib/ar-lib
index 1e9388e2a..c349042c3 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2019-07-04.01; # UTC
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
# Written by Peter Rosin <peda@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/compile b/lib/compile
index 23fcba011..df363c8fb 100755
--- a/lib/compile
+++ b/lib/compile
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/config.guess b/lib/config.guess
index 0fc11edb2..e81d3ae7c 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2020 Free Software Foundation, Inc.
+# Copyright 1992-2021 Free Software Foundation, Inc.
-timestamp='2020-11-07'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-06-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,12 +29,20 @@ timestamp='2020-11-07'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
#
# Please send patches to <config-patches@gnu.org>.
-me=$(echo "$0" | sed -e 's,.*/,,')
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION]
@@ -50,7 +60,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2020 Free Software Foundation, Inc.
+Copyright 1992-2021 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,6 +94,9 @@ if test $# != 0; then
exit 1
fi
+# Just in case it came from the environment.
+GUESS=
+
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
@@ -102,8 +115,8 @@ set_cc_for_build() {
# prevent multiple calls if $tmp is already set
test "$tmp" && return 0
: "${TMPDIR=/tmp}"
- # shellcheck disable=SC2039
- { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } ||
+ # shellcheck disable=SC2039,SC3028
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
@@ -112,7 +125,7 @@ set_cc_for_build() {
,,) echo "int x;" > "$dummy.c"
for driver in cc gcc c89 c99 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$driver"
+ CC_FOR_BUILD=$driver
break
fi
done
@@ -131,16 +144,14 @@ if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi
-UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown
-UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown
-UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown
-UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "$UNAME_SYSTEM" in
+case $UNAME_SYSTEM in
Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
+ LIBC=unknown
set_cc_for_build
cat <<-EOF > "$dummy.c"
@@ -149,22 +160,37 @@ Linux|GNU|GNU/*)
LIBC=uclibc
#elif defined(__dietlibc__)
LIBC=dietlibc
+ #elif defined(__GLIBC__)
+ LIBC=gnu
#else
#include <stdarg.h>
+ /* First heuristic to detect musl libc. */
#ifdef __DEFINED_va_list
LIBC=musl
- #else
- LIBC=gnu
#endif
#endif
EOF
- eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')"
+ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "$cc_set_libc"
+
+ # Second heuristic to detect musl libc.
+ if [ "$LIBC" = unknown ] &&
+ command -v ldd >/dev/null &&
+ ldd --version 2>&1 | grep -q ^musl; then
+ LIBC=musl
+ fi
+
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ if [ "$LIBC" = unknown ]; then
+ LIBC=gnu
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -176,12 +202,11 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
#
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \
- "/sbin/$sysctl" 2>/dev/null || \
- "/usr/sbin/$sysctl" 2>/dev/null || \
- echo unknown))
- case "$UNAME_MACHINE_ARCH" in
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+ echo unknown)`
+ case $UNAME_MACHINE_ARCH in
aarch64eb) machine=aarch64_be-unknown ;;
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
@@ -189,15 +214,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,')
- endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p')
- machine="${arch}${endian}"-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
;;
- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ *) machine=$UNAME_MACHINE_ARCH-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "$UNAME_MACHINE_ARCH" in
+ case $UNAME_MACHINE_ARCH in
earm*)
os=netbsdelf
;;
@@ -218,10 +243,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
;;
esac
# Determine ABI tags.
- case "$UNAME_MACHINE_ARCH" in
+ case $UNAME_MACHINE_ARCH in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr")
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -229,76 +254,82 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "$UNAME_VERSION" in
+ case $UNAME_VERSION in
Debian*)
release='-gnu'
;;
*)
- release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2)
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "$machine-${os}${release}${abi-}"
- exit ;;
+ GUESS=$machine-${os}${release}${abi-}
+ ;;
*:Bitrig:*:*)
- UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
- exit ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+ ;;
*:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
- exit ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+ ;;
+ *:SecBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+ ;;
*:LibertyBSD:*:*)
- UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
- exit ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+ ;;
*:MidnightBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+ ;;
*:ekkoBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+ ;;
*:SolidBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+ ;;
*:OS108:*:*)
- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+ ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
- exit ;;
+ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+ ;;
*:MirBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+ ;;
*:Sortix:*:*)
- echo "$UNAME_MACHINE"-unknown-sortix
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-sortix
+ ;;
*:Twizzler:*:*)
- echo "$UNAME_MACHINE"-unknown-twizzler
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-twizzler
+ ;;
*:Redox:*:*)
- echo "$UNAME_MACHINE"-unknown-redox
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-redox
+ ;;
mips:OSF1:*.*)
- echo mips-dec-osf1
- exit ;;
+ GUESS=mips-dec-osf1
+ ;;
alpha:OSF1:*:*)
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ trap '' 0
case $UNAME_RELEASE in
*4.0)
- UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}')
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}')
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
# types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1)
- case "$ALPHA_CPU_TYPE" in
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case $ALPHA_CPU_TYPE in
"EV4 (21064)")
UNAME_MACHINE=alpha ;;
"EV4.5 (21064)")
@@ -335,68 +366,69 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)"
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
+ OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+ ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
+ GUESS=m68k-unknown-sysv4
+ ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-amigaos
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-amigaos
+ ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-morphos
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-morphos
+ ;;
*:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
+ GUESS=i370-ibm-openedition
+ ;;
*:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
+ GUESS=s390-ibm-zvmoe
+ ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
+ GUESS=powerpc-ibm-os400
+ ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix"$UNAME_RELEASE"
- exit ;;
+ GUESS=arm-acorn-riscix$UNAME_RELEASE
+ ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
+ GUESS=arm-unknown-riscos
+ ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
+ GUESS=hppa1.1-hitachi-hiuxmpp
+ ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "$( (/bin/universe) 2>/dev/null)" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
+ case `(/bin/universe) 2>/dev/null` in
+ att) GUESS=pyramid-pyramid-sysv3 ;;
+ *) GUESS=pyramid-pyramid-bsd ;;
+ esac
+ ;;
NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
+ GUESS=pyramid-pyramid-svr4
+ ;;
DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
+ GUESS=sparc-icl-nx6
+ ;;
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case $(/usr/bin/uname -p) in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
+ case `/usr/bin/uname -p` in
+ sparc) GUESS=sparc-icl-nx7 ;;
+ esac
+ ;;
s390x:SunOS:*:*)
- echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+ ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-hal-solaris2$SUN_REL
+ ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-sun-solaris2$SUN_REL
+ ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux"$UNAME_RELEASE"
- exit ;;
+ GUESS=i386-pc-auroraux$UNAME_RELEASE
+ ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
set_cc_for_build
SUN_ARCH=i386
@@ -411,41 +443,44 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
SUN_ARCH=x86_64
fi
fi
- echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+ ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-sun-solaris3$SUN_REL
+ ;;
sun4*:SunOS:*:*)
- case "$(/usr/bin/arch -k)" in
+ case `/usr/bin/arch -k` in
Series*|S4*)
- UNAME_RELEASE=$(uname -v)
+ UNAME_RELEASE=`uname -v`
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+ GUESS=sparc-sun-sunos$SUN_REL
+ ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-sun-sunos$UNAME_RELEASE
+ ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
- case "$(/bin/arch)" in
+ case `/bin/arch` in
sun3)
- echo m68k-sun-sunos"$UNAME_RELEASE"
+ GUESS=m68k-sun-sunos$UNAME_RELEASE
;;
sun4)
- echo sparc-sun-sunos"$UNAME_RELEASE"
+ GUESS=sparc-sun-sunos$UNAME_RELEASE
;;
esac
- exit ;;
+ ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos"$UNAME_RELEASE"
- exit ;;
+ GUESS=sparc-auspex-sunos$UNAME_RELEASE
+ ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -455,41 +490,41 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-milan-mint$UNAME_RELEASE
+ ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-hades-mint$UNAME_RELEASE
+ ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-unknown-mint$UNAME_RELEASE
+ ;;
m68k:machten:*:*)
- echo m68k-apple-machten"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-apple-machten$UNAME_RELEASE
+ ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten"$UNAME_RELEASE"
- exit ;;
+ GUESS=powerpc-apple-machten$UNAME_RELEASE
+ ;;
RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
+ GUESS=mips-dec-mach_bsd4.3
+ ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix"$UNAME_RELEASE"
- exit ;;
+ GUESS=mips-dec-ultrix$UNAME_RELEASE
+ ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix"$UNAME_RELEASE"
- exit ;;
+ GUESS=vax-dec-ultrix$UNAME_RELEASE
+ ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix"$UNAME_RELEASE"
- exit ;;
+ GUESS=clipper-intergraph-clix$UNAME_RELEASE
+ ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
@@ -514,78 +549,79 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
}
EOF
$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
- dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') &&
- SYSTEM_NAME=$("$dummy" "$dummyarg") &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos"$UNAME_RELEASE"
- exit ;;
+ GUESS=mips-mips-riscos$UNAME_RELEASE
+ ;;
Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
+ GUESS=powerpc-motorola-powermax
+ ;;
Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
+ GUESS=powerpc-harris-powermax
+ ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
+ GUESS=powerpc-harris-powermax
+ ;;
Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
+ GUESS=powerpc-harris-powerunix
+ ;;
m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
+ GUESS=m88k-harris-cxux7
+ ;;
m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
+ GUESS=m88k-motorola-sysv4
+ ;;
m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
+ GUESS=m88k-motorola-sysv3
+ ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=$(/usr/bin/uname -p)
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
then
if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
test "$TARGET_BINARY_INTERFACE"x = x
then
- echo m88k-dg-dgux"$UNAME_RELEASE"
+ GUESS=m88k-dg-dgux$UNAME_RELEASE
else
- echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
fi
else
- echo i586-dg-dgux"$UNAME_RELEASE"
+ GUESS=i586-dg-dgux$UNAME_RELEASE
fi
- exit ;;
+ ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
+ GUESS=m88k-dolphin-sysv3
+ ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
+ GUESS=m88k-motorola-sysv3
+ ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
+ GUESS=m88k-tektronix-sysv3
+ ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
+ GUESS=m68k-tektronix-bsd
+ ;;
*:IRIX*:*:*)
- echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')"
- exit ;;
+ IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+ GUESS=mips-sgi-irix$IRIX_REL
+ ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX '
+ GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
+ GUESS=i386-ibm-aix
+ ;;
ia64:AIX:*:*)
if test -x /usr/bin/oslevel ; then
- IBM_REV=$(/usr/bin/oslevel)
+ IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
fi
- echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
- exit ;;
+ GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+ ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
set_cc_for_build
@@ -600,68 +636,68 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy")
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
- echo "$SYSTEM_NAME"
+ GUESS=$SYSTEM_NAME
else
- echo rs6000-ibm-aix3.2.5
+ GUESS=rs6000-ibm-aix3.2.5
fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
+ GUESS=rs6000-ibm-aix3.2.4
else
- echo rs6000-ibm-aix3.2
+ GUESS=rs6000-ibm-aix3.2
fi
- exit ;;
+ ;;
*:AIX:*:[4567])
- IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }')
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
fi
if test -x /usr/bin/lslpp ; then
- IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
- awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
fi
- echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
- exit ;;
+ GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+ ;;
*:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
+ GUESS=rs6000-ibm-aix
+ ;;
ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
+ GUESS=romp-ibm-bsd4.4
+ ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
+ GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
+ ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
+ GUESS=rs6000-bull-bosx
+ ;;
DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
+ GUESS=m68k-bull-sysv3
+ ;;
9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
+ GUESS=m68k-hp-bsd
+ ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
+ GUESS=m68k-hp-bsd4.4
+ ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
- case "$UNAME_MACHINE" in
+ HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+ case $UNAME_MACHINE in
9000/31?) HP_ARCH=m68000 ;;
9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if test -x /usr/bin/getconf; then
- sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null)
- sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null)
- case "$sc_cpu_version" in
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case $sc_cpu_version in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "$sc_kernel_bits" in
+ case $sc_kernel_bits in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
@@ -703,7 +739,7 @@ EOF
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy")
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
@@ -728,12 +764,12 @@ EOF
HP_ARCH=hppa64
fi
fi
- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
- exit ;;
+ GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+ ;;
ia64:HP-UX:*:*)
- HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
- echo ia64-hp-hpux"$HPUX_REV"
- exit ;;
+ HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+ GUESS=ia64-hp-hpux$HPUX_REV
+ ;;
3050*:HI-UX:*:*)
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
@@ -761,38 +797,38 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
+ GUESS=unknown-hitachi-hiuxwe2
+ ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
- echo hppa1.1-hp-bsd
- exit ;;
+ GUESS=hppa1.1-hp-bsd
+ ;;
9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit ;;
+ GUESS=hppa1.0-hp-bsd
+ ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
+ GUESS=hppa1.0-hp-mpeix
+ ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
- echo hppa1.1-hp-osf
- exit ;;
+ GUESS=hppa1.1-hp-osf
+ ;;
hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit ;;
+ GUESS=hppa1.0-hp-osf
+ ;;
i*86:OSF1:*:*)
if test -x /usr/sbin/sysversion ; then
- echo "$UNAME_MACHINE"-unknown-osf1mk
+ GUESS=$UNAME_MACHINE-unknown-osf1mk
else
- echo "$UNAME_MACHINE"-unknown-osf1
+ GUESS=$UNAME_MACHINE-unknown-osf1
fi
- exit ;;
+ ;;
parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit ;;
+ GUESS=hppa1.1-hp-lites
+ ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit ;;
+ GUESS=c1-convex-bsd
+ ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
@@ -800,17 +836,18 @@ EOF
fi
exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit ;;
+ GUESS=c34-convex-bsd
+ ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit ;;
+ GUESS=c38-convex-bsd
+ ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit ;;
+ GUESS=c4-convex-bsd
+ ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=ymp-cray-unicos$CRAY_REL
+ ;;
CRAY*[A-Z]90:*:*:*)
echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
@@ -818,114 +855,126 @@ EOF
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=t90-cray-unicos$CRAY_REL
+ ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
+ ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=sv1-cray-unicos$CRAY_REL
+ ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=craynv-cray-unicosmp$CRAY_REL
+ ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)
- FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
- FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/')
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+ GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+ ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///')
- FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/')
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+ ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+ ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi"$UNAME_RELEASE"
- exit ;;
+ GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+ ;;
*:BSD/OS:*:*)
- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+ ;;
arm:FreeBSD:*:*)
- UNAME_PROCESSOR=$(uname -p)
+ UNAME_PROCESSOR=`uname -p`
set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
else
- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
fi
- exit ;;
+ ;;
*:FreeBSD:*:*)
- UNAME_PROCESSOR=$(/usr/bin/uname -p)
- case "$UNAME_PROCESSOR" in
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case $UNAME_PROCESSOR in
amd64)
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
- echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
- exit ;;
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+ ;;
i*:CYGWIN*:*)
- echo "$UNAME_MACHINE"-pc-cygwin
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-cygwin
+ ;;
*:MINGW64*:*)
- echo "$UNAME_MACHINE"-pc-mingw64
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-mingw64
+ ;;
*:MINGW*:*)
- echo "$UNAME_MACHINE"-pc-mingw32
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-mingw32
+ ;;
*:MSYS*:*)
- echo "$UNAME_MACHINE"-pc-msys
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-msys
+ ;;
i*:PW*:*)
- echo "$UNAME_MACHINE"-pc-pw32
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-pw32
+ ;;
*:Interix*:*)
- case "$UNAME_MACHINE" in
+ case $UNAME_MACHINE in
x86)
- echo i586-pc-interix"$UNAME_RELEASE"
- exit ;;
+ GUESS=i586-pc-interix$UNAME_RELEASE
+ ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix"$UNAME_RELEASE"
- exit ;;
+ GUESS=x86_64-unknown-interix$UNAME_RELEASE
+ ;;
IA64)
- echo ia64-unknown-interix"$UNAME_RELEASE"
- exit ;;
+ GUESS=ia64-unknown-interix$UNAME_RELEASE
+ ;;
esac ;;
i*:UWIN*:*)
- echo "$UNAME_MACHINE"-pc-uwin
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-uwin
+ ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-pc-cygwin
- exit ;;
+ GUESS=x86_64-pc-cygwin
+ ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
- exit ;;
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=powerpcle-unknown-solaris2$SUN_REL
+ ;;
*:GNU:*:*)
# the GNU system
- echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
- exit ;;
+ GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+ ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
- exit ;;
+ GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+ ;;
*:Minix:*:*)
- echo "$UNAME_MACHINE"-unknown-minix
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-minix
+ ;;
aarch64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
alpha:Linux:*:*)
- case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
EV5) UNAME_MACHINE=alphaev5 ;;
EV56) UNAME_MACHINE=alphaev56 ;;
PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -936,60 +985,63 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
arm*:Linux:*:*)
set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
else
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
fi
fi
- exit ;;
+ ;;
avr32*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
cris:Linux:*:*)
- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+ ;;
crisv32:Linux:*:*)
- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+ ;;
e2k:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
frv:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
hexagon:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
i*86:Linux:*:*)
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+ ;;
ia64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
k1om:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
m32r*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
m68*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build
IS_GLIBC=0
@@ -1034,65 +1086,66 @@ EOF
#endif
#endif
EOF
- eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
+ cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+ eval "$cc_set_vars"
test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
;;
mips64el:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=or1k-unknown-linux-$LIBC
+ ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=sparc-unknown-linux-$LIBC
+ ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=hppa64-unknown-linux-$LIBC
+ ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
- case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in
- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
- *) echo hppa-unknown-linux-"$LIBC" ;;
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+ PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+ *) GUESS=hppa-unknown-linux-$LIBC ;;
esac
- exit ;;
+ ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=powerpc64-unknown-linux-$LIBC
+ ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=powerpc-unknown-linux-$LIBC
+ ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=powerpc64le-unknown-linux-$LIBC
+ ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-"$LIBC"
- exit ;;
- riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=powerpcle-unknown-linux-$LIBC
+ ;;
+ riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+ ;;
sh64*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
sh*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
tile*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
vax:Linux:*:*)
- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+ ;;
x86_64:Linux:*:*)
set_cc_for_build
LIBCABI=$LIBC
@@ -1101,71 +1154,71 @@ EOF
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_X32 >/dev/null
then
- LIBCABI="$LIBC"x32
+ LIBCABI=${LIBC}x32
fi
fi
- echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ ;;
xtensa*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
- echo i386-sequent-sysv4
- exit ;;
+ GUESS=i386-sequent-sysv4
+ ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+ ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo "$UNAME_MACHINE"-pc-os2-emx
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-os2-emx
+ ;;
i*86:XTS-300:*:STOP)
- echo "$UNAME_MACHINE"-unknown-stop
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-stop
+ ;;
i*86:atheos:*:*)
- echo "$UNAME_MACHINE"-unknown-atheos
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-atheos
+ ;;
i*86:syllable:*:*)
- echo "$UNAME_MACHINE"-pc-syllable
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-syllable
+ ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
+ GUESS=i386-unknown-lynxos$UNAME_RELEASE
+ ;;
i*86:*DOS:*:*)
- echo "$UNAME_MACHINE"-pc-msdosdjgpp
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+ ;;
i*86:*:4.*:*)
- UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
else
- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
fi
- exit ;;
+ ;;
i*86:*:5:[678]*)
# UnixWare 7.x, OpenUNIX and OpenServer 6.
- case $(/bin/uname -X | grep "^Machine") in
+ case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
- UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
@@ -1173,11 +1226,11 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
else
- echo "$UNAME_MACHINE"-pc-sysv32
+ GUESS=$UNAME_MACHINE-pc-sysv32
fi
- exit ;;
+ ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1185,37 +1238,37 @@ EOF
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
- echo i586-pc-msdosdjgpp
- exit ;;
+ GUESS=i586-pc-msdosdjgpp
+ ;;
Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
+ GUESS=i386-pc-mach3
+ ;;
paragon:*:*:*)
- echo i860-intel-osf1
- exit ;;
+ GUESS=i860-intel-osf1
+ ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
+ GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
fi
- exit ;;
+ ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
- echo m68010-convergent-sysv
- exit ;;
+ GUESS=m68010-convergent-sysv
+ ;;
mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit ;;
+ GUESS=m68k-convergent-sysv
+ ;;
M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit ;;
+ GUESS=m68k-diab-dnix
+ ;;
M68*:*:R3V[5678]*:*)
test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
- && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
@@ -1226,7 +1279,7 @@ EOF
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
- && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid)
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
@@ -1234,118 +1287,118 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+ ;;
mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
+ GUESS=m68k-atari-sysv4
+ ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
+ GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+ ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
+ GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+ ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
+ GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+ ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv"$UNAME_RELEASE"
- exit ;;
+ GUESS=mips-dde-sysv$UNAME_RELEASE
+ ;;
RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
+ GUESS=mips-sni-sysv4
+ ;;
RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
+ GUESS=mips-sni-sysv4
+ ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=$( (uname -p) 2>/dev/null)
- echo "$UNAME_MACHINE"-sni-sysv4
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ GUESS=$UNAME_MACHINE-sni-sysv4
else
- echo ns32k-sni-sysv
+ GUESS=ns32k-sni-sysv
fi
- exit ;;
+ ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ GUESS=i586-unisys-sysv4
+ ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit ;;
+ GUESS=hppa1.1-stratus-sysv4
+ ;;
*:*:*:FTX*)
# From seanf@swdc.stratus.com.
- echo i860-stratus-sysv4
- exit ;;
+ GUESS=i860-stratus-sysv4
+ ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo "$UNAME_MACHINE"-stratus-vos
- exit ;;
+ GUESS=$UNAME_MACHINE-stratus-vos
+ ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
+ GUESS=hppa1.1-stratus-vos
+ ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux"$UNAME_RELEASE"
- exit ;;
+ GUESS=m68k-apple-aux$UNAME_RELEASE
+ ;;
news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
+ GUESS=mips-sony-newsos6
+ ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if test -d /usr/nec; then
- echo mips-nec-sysv"$UNAME_RELEASE"
+ GUESS=mips-nec-sysv$UNAME_RELEASE
else
- echo mips-unknown-sysv"$UNAME_RELEASE"
+ GUESS=mips-unknown-sysv$UNAME_RELEASE
fi
- exit ;;
+ ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
+ GUESS=powerpc-be-beos
+ ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit ;;
+ GUESS=powerpc-apple-beos
+ ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
+ GUESS=i586-pc-beos
+ ;;
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
+ GUESS=i586-pc-haiku
+ ;;
x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
- exit ;;
+ GUESS=x86_64-unknown-haiku
+ ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx4-nec-superux$UNAME_RELEASE
+ ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx5-nec-superux$UNAME_RELEASE
+ ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx6-nec-superux$UNAME_RELEASE
+ ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx7-nec-superux$UNAME_RELEASE
+ ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx8-nec-superux$UNAME_RELEASE
+ ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sx8r-nec-superux$UNAME_RELEASE
+ ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux"$UNAME_RELEASE"
- exit ;;
+ GUESS=sxace-nec-superux$UNAME_RELEASE
+ ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody"$UNAME_RELEASE"
- exit ;;
+ GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+ ;;
*:Rhapsody:*:*)
- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+ ;;
arm64:Darwin:*:*)
- echo aarch64-apple-darwin"$UNAME_RELEASE"
- exit ;;
+ GUESS=aarch64-apple-darwin$UNAME_RELEASE
+ ;;
*:Darwin:*:*)
- UNAME_PROCESSOR=$(uname -p)
+ UNAME_PROCESSOR=`uname -p`
case $UNAME_PROCESSOR in
unknown) UNAME_PROCESSOR=powerpc ;;
esac
@@ -1379,109 +1432,116 @@ EOF
# uname -m returns i386 or x86_64
UNAME_PROCESSOR=$UNAME_MACHINE
fi
- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+ ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=$(uname -p)
+ UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = x86; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+ ;;
*:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
+ GUESS=i386-pc-qnx
+ ;;
NEO-*:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk"$UNAME_RELEASE"
- exit ;;
+ GUESS=neo-tandem-nsk$UNAME_RELEASE
+ ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk"$UNAME_RELEASE"
- exit ;;
+ GUESS=nse-tandem-nsk$UNAME_RELEASE
+ ;;
NSR-*:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk"$UNAME_RELEASE"
- exit ;;
+ GUESS=nsr-tandem-nsk$UNAME_RELEASE
+ ;;
NSV-*:NONSTOP_KERNEL:*:*)
- echo nsv-tandem-nsk"$UNAME_RELEASE"
- exit ;;
+ GUESS=nsv-tandem-nsk$UNAME_RELEASE
+ ;;
NSX-*:NONSTOP_KERNEL:*:*)
- echo nsx-tandem-nsk"$UNAME_RELEASE"
- exit ;;
+ GUESS=nsx-tandem-nsk$UNAME_RELEASE
+ ;;
*:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit ;;
+ GUESS=mips-compaq-nonstopux
+ ;;
BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit ;;
+ GUESS=bs2000-siemens-sysv
+ ;;
DS/*:UNIX_System_V:*:*)
- echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+ ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- # shellcheck disable=SC2154
- if test "$cputype" = 386; then
+ if test "${cputype-}" = 386; then
UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
+ elif test "x${cputype-}" != x; then
+ UNAME_MACHINE=$cputype
fi
- echo "$UNAME_MACHINE"-unknown-plan9
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-plan9
+ ;;
*:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit ;;
+ GUESS=pdp10-unknown-tops10
+ ;;
*:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit ;;
+ GUESS=pdp10-unknown-tenex
+ ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit ;;
+ GUESS=pdp10-dec-tops20
+ ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit ;;
+ GUESS=pdp10-xkl-tops20
+ ;;
*:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit ;;
+ GUESS=pdp10-unknown-tops20
+ ;;
*:ITS:*:*)
- echo pdp10-unknown-its
- exit ;;
+ GUESS=pdp10-unknown-its
+ ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux"$UNAME_RELEASE"
- exit ;;
+ GUESS=mips-sei-seiux$UNAME_RELEASE
+ ;;
*:DragonFly:*:*)
- echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
- exit ;;
+ DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+ ;;
*:*VMS:*:*)
- UNAME_MACHINE=$( (uname -p) 2>/dev/null)
- case "$UNAME_MACHINE" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case $UNAME_MACHINE in
+ A*) GUESS=alpha-dec-vms ;;
+ I*) GUESS=ia64-dec-vms ;;
+ V*) GUESS=vax-dec-vms ;;
esac ;;
*:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
+ GUESS=i386-pc-xenix
+ ;;
i*86:skyos:*:*)
- echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
- exit ;;
+ SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+ ;;
i*86:rdos:*:*)
- echo "$UNAME_MACHINE"-pc-rdos
- exit ;;
- i*86:AROS:*:*)
- echo "$UNAME_MACHINE"-pc-aros
- exit ;;
+ GUESS=$UNAME_MACHINE-pc-rdos
+ ;;
+ *:AROS:*:*)
+ GUESS=$UNAME_MACHINE-unknown-aros
+ ;;
x86_64:VMkernel:*:*)
- echo "$UNAME_MACHINE"-unknown-esx
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-esx
+ ;;
amd64:Isilon\ OneFS:*:*)
- echo x86_64-unknown-onefs
- exit ;;
+ GUESS=x86_64-unknown-onefs
+ ;;
*:Unleashed:*:*)
- echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
- exit ;;
+ GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+ ;;
esac
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+ echo "$GUESS"
+ exit
+fi
+
# No uname command or uname output not recognized.
set_cc_for_build
cat > "$dummy.c" <<EOF
@@ -1521,7 +1581,7 @@ main ()
#define __ARCHITECTURE__ "m68k"
#endif
int version;
- version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null);
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
@@ -1613,7 +1673,7 @@ main ()
}
EOF
-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) &&
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
@@ -1621,7 +1681,7 @@ test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
echo "$0: unable to guess system type" >&2
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+case $UNAME_MACHINE:$UNAME_SYSTEM in
mips:Linux | mips64:Linux)
# If we got here on MIPS GNU/Linux, output extra information.
cat >&2 <<EOF
@@ -1638,14 +1698,16 @@ This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
and
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
EOF
-year=$(echo $timestamp | sed 's,-.*,,')
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
# shellcheck disable=SC2003
-if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
cat >&2 <<EOF
If $0 has already been updated, send the following data and any
@@ -1654,20 +1716,20 @@ provide the necessary information to handle your system.
config.guess timestamp = $timestamp
-uname -m = $( (uname -m) 2>/dev/null || echo unknown)
-uname -r = $( (uname -r) 2>/dev/null || echo unknown)
-uname -s = $( (uname -s) 2>/dev/null || echo unknown)
-uname -v = $( (uname -v) 2>/dev/null || echo unknown)
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null)
-/bin/uname -X = $( (/bin/uname -X) 2>/dev/null)
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-hostinfo = $( (hostinfo) 2>/dev/null)
-/bin/universe = $( (/bin/universe) 2>/dev/null)
-/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null)
-/bin/arch = $( (/bin/arch) 2>/dev/null)
-/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null)
-/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null)
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
UNAME_MACHINE = "$UNAME_MACHINE"
UNAME_RELEASE = "$UNAME_RELEASE"
diff --git a/lib/config.sub b/lib/config.sub
index c874b7a9d..d80c5d759 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1,8 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2020 Free Software Foundation, Inc.
+# Copyright 1992-2021 Free Software Foundation, Inc.
-timestamp='2020-11-07'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-07-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -33,7 +35,7 @@ timestamp='2020-11-07'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -50,7 +52,14 @@ timestamp='2020-11-07'
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
-me=$(echo "$0" | sed -e 's,.*/,,')
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
@@ -67,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2020 Free Software Foundation, Inc.
+Copyright 1992-2021 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -769,22 +778,22 @@ case $basic_machine in
vendor=hp
;;
i*86v32)
- cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
basic_os=sysv32
;;
i*86v4*)
- cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
basic_os=sysv4
;;
i*86v)
- cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
basic_os=sysv
;;
i*86sol2)
- cpu=$(echo "$1" | sed -e 's/86.*/86/')
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
basic_os=solaris2
;;
@@ -917,7 +926,7 @@ case $basic_machine in
;;
leon-*|leon[3-9]-*)
cpu=sparc
- vendor=$(echo "$basic_machine" | sed 's/-.*//')
+ vendor=`echo "$basic_machine" | sed 's/-.*//'`
;;
*-*)
@@ -1084,7 +1093,7 @@ case $cpu-$vendor in
cpu=mipsisa64sb1el
;;
sh5e[lb]-*)
- cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/')
+ cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
;;
spur-*)
cpu=spur
@@ -1102,7 +1111,7 @@ case $cpu-$vendor in
cpu=x86_64
;;
xscale-* | xscalee[bl]-*)
- cpu=$(echo "$cpu" | sed 's/^xscale/arm/')
+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
arm64-*)
cpu=aarch64
@@ -1165,7 +1174,7 @@ case $cpu-$vendor in
| alphapca5[67] | alpha64pca5[67] \
| am33_2.0 \
| amdgcn \
- | arc | arceb \
+ | arc | arceb | arc32 | arc64 \
| arm | arm[lb]e | arme[lb] | armv* \
| avr | avr32 \
| asmjs \
@@ -1185,6 +1194,7 @@ case $cpu-$vendor in
| k1om \
| le32 | le64 \
| lm32 \
+ | loongarch32 | loongarch64 | loongarchx32 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1203,9 +1213,13 @@ case $cpu-$vendor in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r3 | mipsisa32r3el \
+ | mipsisa32r5 | mipsisa32r5el \
| mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r3 | mipsisa64r3el \
+ | mipsisa64r5 | mipsisa64r5el \
| mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
@@ -1229,7 +1243,7 @@ case $cpu-$vendor in
| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
| pru \
| pyramid \
- | riscv | riscv32 | riscv64 \
+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
| rl78 | romp | rs6000 | rx \
| s390 | s390x \
| score \
@@ -1241,6 +1255,7 @@ case $cpu-$vendor in
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
| spu \
| tahoe \
+ | thumbv7* \
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
| tron \
| ubicom32 \
@@ -1286,15 +1301,15 @@ then
case $basic_os in
gnu/linux*)
kernel=linux
- os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|')
+ os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
;;
os2-emx)
kernel=os2
- os=$(echo $basic_os | sed -e 's|os2-emx|emx|')
+ os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
;;
nto-qnx*)
kernel=nto
- os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|')
+ os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
;;
*-*)
# shellcheck disable=SC2162
@@ -1305,11 +1320,11 @@ EOF
# Default OS when just kernel was specified
nto*)
kernel=nto
- os=$(echo $basic_os | sed -e 's|nto|qnx|')
+ os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
;;
linux*)
kernel=linux
- os=$(echo $basic_os | sed -e 's|linux|gnu|')
+ os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
;;
*)
kernel=
@@ -1330,7 +1345,7 @@ case $os in
os=cnk
;;
solaris1 | solaris1.*)
- os=$(echo $os | sed -e 's|solaris1|sunos4|')
+ os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
;;
solaris)
os=solaris2
@@ -1359,7 +1374,7 @@ case $os in
os=sco3.2v4
;;
sco3.2.[4-9]*)
- os=$(echo $os | sed -e 's/sco3.2./sco3.2v/')
+ os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
;;
sco*v* | scout)
# Don't match below
@@ -1389,7 +1404,7 @@ case $os in
os=lynxos
;;
mac[0-9]*)
- os=$(echo "$os" | sed -e 's|mac|macos|')
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
opened*)
os=openedition
@@ -1398,10 +1413,10 @@ case $os in
os=os400
;;
sunos5*)
- os=$(echo "$os" | sed -e 's|sunos5|solaris2|')
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
sunos6*)
- os=$(echo "$os" | sed -e 's|sunos6|solaris3|')
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
wince*)
os=wince
@@ -1435,7 +1450,7 @@ case $os in
;;
# Preserve the version number of sinix5.
sinix5.*)
- os=$(echo $os | sed -e 's|sinix|sysv|')
+ os=`echo "$os" | sed -e 's|sinix|sysv|'`
;;
sinix*)
os=sysv4
@@ -1681,11 +1696,14 @@ fi
# Now, validate our (potentially fixed-up) OS.
case $os in
- # Sometimes we do "kernel-abi", so those need to count as OSes.
+ # Sometimes we do "kernel-libc", so those need to count as OSes.
musl* | newlib* | uclibc*)
;;
- # Likewise for "kernel-libc"
- eabi | eabihf | gnueabi | gnueabihf)
+ # Likewise for "kernel-abi"
+ eabi* | gnueabi*)
+ ;;
+ # VxWorks passes extra cpu info in the 4th filed.
+ simlinux | simwindows | spe)
;;
# Now accept the basic system types.
# The portable systems comes first.
@@ -1702,12 +1720,12 @@ case $os in
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
| mirbsd* | netbsd* | dicos* | openedition* | ose* \
- | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
+ | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
| ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
| bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
| ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
| udi* | lites* | ieee* | go32* | aux* | hcos* \
- | chorusrdb* | cegcc* | glidix* \
+ | chorusrdb* | cegcc* | glidix* | serenity* \
| cygwin* | msys* | pe* | moss* | proelf* | rtems* \
| midipix* | mingw32* | mingw64* | mint* \
| uxpv* | beos* | mpeix* | udk* | moxiebox* \
@@ -1749,6 +1767,8 @@ case $kernel-$os in
;;
kfreebsd*-gnu* | kopensolaris*-gnu*)
;;
+ vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+ ;;
nto-qnx*)
;;
os2-emx)
diff --git a/lib/depcomp b/lib/depcomp
index 6b391623c..715e34311 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/lib/gendocs.sh b/lib/gendocs.sh
index dec8eb9af..1241ee35a 100755
--- a/lib/gendocs.sh
+++ b/lib/gendocs.sh
@@ -2,9 +2,9 @@
# gendocs.sh -- generate a GNU manual in many formats. This script is
# mentioned in maintain.texi. See the help message below for usage details.
-scriptversion=2020-01-01.00
+scriptversion=2021-07-19.18
-# Copyright 2003-2020 Free Software Foundation, Inc.
+# Copyright 2003-2021 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
@@ -58,7 +58,7 @@ EMAIL=webmasters@gnu.org # please override with --email
commonarg= # passed to all makeinfo/texi2html invcations.
dirargs= # passed to all tools (-I dir).
dirs= # -I directories.
-htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
+htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
default_htmlarg=true
infoarg=--no-split
generate_ascii=true
@@ -73,7 +73,7 @@ texarg="-t @finalout"
version="gendocs.sh $scriptversion
-Copyright 2020 Free Software Foundation, Inc.
+Copyright 2021 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING."
@@ -202,7 +202,7 @@ base=$PACKAGE
if $default_htmlarg && test -n "$use_texi2html"; then
# The legacy texi2html doesn't support TOP_NODE_UP_URL
- htmlarg="--css-ref=/software/gnulib/manual.css"
+ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css"
fi
if test -n "$srcfile"; then
diff --git a/lib/gendocs_template b/lib/gendocs_template
index ee26d331f..cd9ac3831 100644
--- a/lib/gendocs_template
+++ b/lib/gendocs_template
@@ -2,7 +2,7 @@
<!-- Parent-Version: 1.78 -->
<!--
-Copyright (C) 2006-2020 Free Software Foundation, Inc.
+Copyright (C) 2006-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index be8082e7f..9ff15f601 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@
# Convert git log output to ChangeLog format.
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
@@ -35,7 +35,7 @@
eval 'exec perl -wSx "$0" "$@"'
if 0;
-my $VERSION = '2020-04-04 15:07'; # UTC
+my $VERSION = '2021-02-24 23:42'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -455,7 +455,8 @@ sub git_dir_option($)
# If there were any lines
if (@line == 0)
{
- warn "$ME: warning: empty commit message:\n $date_line\n";
+ warn "$ME: warning: empty commit message:\n"
+ . " commit $sha\n $date_line\n";
}
else
{
diff --git a/lib/gnupload b/lib/gnupload
index fb8733480..e7822aed7 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,9 +1,9 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2018-05-19.18; # UTC
+scriptversion=2021-04-11.09; # UTC
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package
Send patches and bug reports to <bug-gnulib@gnu.org>."
+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'`
+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc.
+License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
+
# Read local configuration file
if test -r "$conffile"; then
echo "$0: Reading configuration file $conffile"
@@ -209,7 +215,8 @@ while test -n "$1"; do
;;
--version)
echo "gnupload $scriptversion"
- exit $?
+ echo "$copyright"
+ exit 0
;;
--)
shift
diff --git a/lib/local.mk b/lib/local.mk
index fdc96c761..ddd18a1d9 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 6a6a4bcf2..e6d572d4c 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 Free Software Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/missing b/lib/missing
index 8d0eaad25..1fe1611f1 100755
--- a/lib/missing
+++ b/lib/missing
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/py-compile b/lib/py-compile
index e56d98d6e..c45a77de2 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -3,7 +3,7 @@
scriptversion=2020-02-19.23; # UTC
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
@@ -115,7 +115,7 @@ else
filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
fi
-python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
+python_major=`$PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q'`
if test -z "$python_major"; then
echo "$me: could not determine $PYTHON major version, guessing 3" >&2
python_major=3
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 0ca490375..fea066f56 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/lib/test-driver b/lib/test-driver
index 9759384aa..be73b80ad 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -105,8 +105,11 @@ trap "st=130; $do_exit" 2
trap "st=141; $do_exit" 13
trap "st=143; $do_exit" 15
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@ esac
# know whether the test passed or failed simply by looking at the '.log'
# file, without the need of also peaking into the corresponding '.trs'
# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 3c7051d1c..e48383def 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,9 +3,9 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2020-10-24.12}
+\def\texinfoversion{2021-04-25.21}
%
-% Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -572,9 +572,8 @@
\fi
}
-% @end foo executes the definition of \Efoo.
-% But first, it executes a specialized version of \checkenv
-%
+
+% @end foo calls \checkenv and executes the definition of \Efoo.
\parseargdef\end{%
\if 1\csname iscond.#1\endcsname
\else
@@ -1003,6 +1002,14 @@ where each line of input produces a line of output.}
\global\everypar = {}%
}
+% leave vertical mode without cancelling any first paragraph indent
+\gdef\imageindent{%
+ \toks0=\everypar
+ \everypar={}%
+ \ptexnoindent
+ \global\everypar=\toks0
+}
+
% @refill is a no-op.
\let\refill=\relax
@@ -1863,19 +1870,23 @@ output) for that.)}
\closein 1
\endgroup
%
- \def\xetexpdfext{pdf}%
- \ifx\xeteximgext\xetexpdfext
- \XeTeXpdffile "#1".\xeteximgext ""
- \else
- \def\xetexpdfext{PDF}%
+ % Putting an \hbox around the image can prevent an over-long line
+ % after the image.
+ \hbox\bgroup
+ \def\xetexpdfext{pdf}%
\ifx\xeteximgext\xetexpdfext
\XeTeXpdffile "#1".\xeteximgext ""
\else
- \XeTeXpicfile "#1".\xeteximgext ""
+ \def\xetexpdfext{PDF}%
+ \ifx\xeteximgext\xetexpdfext
+ \XeTeXpdffile "#1".\xeteximgext ""
+ \else
+ \XeTeXpicfile "#1".\xeteximgext ""
+ \fi
\fi
- \fi
- \ifdim \wd0 >0pt width \xeteximagewidth \fi
- \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
+ \ifdim \wd0 >0pt width \xeteximagewidth \fi
+ \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
+ \egroup
}
\fi
@@ -2673,8 +2684,6 @@ end
\definetextfontsizexi
-\message{markup,}
-
% Check if we are currently using a typewriter font. Since all the
% Computer Modern typewriter fonts have zero interword stretch (and
% shrink), and it is reasonable to expect all typewriter fonts to have
@@ -2682,68 +2691,14 @@ end
%
\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
-% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
-% define and register \INITMACRO to be called on markup style changes.
-% \INITMACRO can check \currentmarkupstyle for the innermost
-% style.
-
-\let\currentmarkupstyle\empty
-
-\def\setupmarkupstyle#1{%
- \def\currentmarkupstyle{#1}%
- \markupstylesetup
-}
-
-\let\markupstylesetup\empty
-
-\def\defmarkupstylesetup#1{%
- \expandafter\def\expandafter\markupstylesetup
- \expandafter{\markupstylesetup #1}%
- \def#1%
-}
-
-% Markup style setup for left and right quotes.
-\defmarkupstylesetup\markupsetuplq{%
- \expandafter\let\expandafter \temp
- \csname markupsetuplq\currentmarkupstyle\endcsname
- \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
-}
-
-\defmarkupstylesetup\markupsetuprq{%
- \expandafter\let\expandafter \temp
- \csname markupsetuprq\currentmarkupstyle\endcsname
- \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
-}
-
{
\catcode`\'=\active
\catcode`\`=\active
-\gdef\markupsetuplqdefault{\let`\lq}
-\gdef\markupsetuprqdefault{\let'\rq}
-
-\gdef\markupsetcodequoteleft{\let`\codequoteleft}
-\gdef\markupsetcodequoteright{\let'\codequoteright}
+\gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright}
+\gdef\setregularquotes{\let`\lq \let'\rq}
}
-\let\markupsetuplqcode \markupsetcodequoteleft
-\let\markupsetuprqcode \markupsetcodequoteright
-%
-\let\markupsetuplqexample \markupsetcodequoteleft
-\let\markupsetuprqexample \markupsetcodequoteright
-%
-\let\markupsetuplqkbd \markupsetcodequoteleft
-\let\markupsetuprqkbd \markupsetcodequoteright
-%
-\let\markupsetuplqsamp \markupsetcodequoteleft
-\let\markupsetuprqsamp \markupsetcodequoteright
-%
-\let\markupsetuplqverb \markupsetcodequoteleft
-\let\markupsetuprqverb \markupsetcodequoteright
-%
-\let\markupsetuplqverbatim \markupsetcodequoteleft
-\let\markupsetuprqverbatim \markupsetcodequoteright
-
% Allow an option to not use regular directed right quote/apostrophe
% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
% The undirected quote is ugly, so don't make it the default, but it
@@ -2906,7 +2861,7 @@ end
}
% @samp.
-\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
+\def\samp#1{{\setcodequotes\lq\tclose{#1}\rq\null}}
% @indicateurl is \samp, that is, with quotes.
\let\indicateurl=\samp
@@ -2949,8 +2904,7 @@ end
\global\let'=\rq \global\let`=\lq % default definitions
%
\global\def\code{\begingroup
- \setupmarkupstyle{code}%
- % The following should really be moved into \setupmarkupstyle handlers.
+ \setcodequotes
\catcode\dashChar=\active \catcode\underChar=\active
\ifallowcodebreaks
\let-\codedash
@@ -3104,7 +3058,7 @@ end
\urefcatcodes
%
\global\def\urefcode{\begingroup
- \setupmarkupstyle{code}%
+ \setcodequotes
\urefcatcodes
\let&\urefcodeamp
\let.\urefcodedot
@@ -3225,8 +3179,8 @@ end
\def\kbdsub#1#2#3\par{%
\def\one{#1}\def\three{#3}\def\threex{??}%
\ifx\one\xkey\ifx\threex\three \key{#2}%
- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+ \else{\tclose{\kbdfont\setcodequotes\look}}\fi
+ \else{\tclose{\kbdfont\setcodequotes\look}}\fi
}
% definition of @key that produces a lozenge. Doesn't adjust to text size.
@@ -3243,7 +3197,7 @@ end
% monospace, don't change it; that way, we respect @kbdinputstyle. But
% if it isn't monospace, then use \tt.
%
-\def\key#1{{\setupmarkupstyle{key}%
+\def\key#1{{\setregularquotes
\nohyphenation
\ifmonospace\else\tt\fi
#1}\null}
@@ -3373,16 +3327,20 @@ end
{\obeylines
\globaldefs=1
\envdef\displaymath{%
-\tex
+\tex%
\def\thisenv{\displaymath}%
+\begingroup\let\end\displaymathend%
$$%
}
-\def\Edisplaymath{$$
+\def\displaymathend{$$\endgroup\end}%
+
+\def\Edisplaymath{%
\def\thisenv{\tex}%
\end tex
}}
+
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
% except specified as a normal braced arg, so no newlines to worry about.
@@ -4343,82 +4301,8 @@ $$%
\doitemize{#1.}\flushcr
}
-% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
-% to @enumerate.
-%
-\def\alphaenumerate{\enumerate{a}}
-\def\capsenumerate{\enumerate{A}}
-\def\Ealphaenumerate{\Eenumerate}
-\def\Ecapsenumerate{\Eenumerate}
-
% @multitable macros
-% Amy Hendrickson, 8/18/94, 3/6/96
-%
-% @multitable ... @end multitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble. Width
-% can be specified either with sample text given in a template line,
-% or in percent of \hsize, the current width of text on page.
-
-% Table can continue over pages but will only break between lines.
-
-% To make preamble:
-%
-% Either define widths of columns in terms of percent of \hsize:
-% @multitable @columnfractions .25 .3 .45
-% @item ...
-%
-% Numbers following @columnfractions are the percent of the total
-% current hsize to be used for each column. You may use as many
-% columns as desired.
-
-
-% Or use a template:
-% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-% @item ...
-% using the widest term desired in each column.
-
-% Each new table line starts with @item, each subsequent new column
-% starts with @tab. Empty columns may be produced by supplying @tab's
-% with nothing between them for as many times as empty columns are needed,
-% ie, @tab@tab@tab will produce two empty columns.
-
-% @item, @tab do not need to be on their own lines, but it will not hurt
-% if they are.
-
-% Sample multitable:
-
-% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-% @item first col stuff @tab second col stuff @tab third col
-% @item
-% first col stuff
-% @tab
-% second col stuff
-% @tab
-% third col
-% @item first col stuff @tab second col stuff
-% @tab Many paragraphs of text may be used in any column.
-%
-% They will wrap at the width determined by the template.
-% @item@tab@tab This will be in third column.
-% @end multitable
-
-% Default dimensions may be reset by user.
-% @multitableparskip is vertical space between paragraphs in table.
-% @multitableparindent is paragraph indent in table.
-% @multitablecolmargin is horizontal space to be left between columns.
-% @multitablelinespace is space to leave between table items, baseline
-% to baseline.
-% 0pt means it depends on current normal line spacing.
-%
-\newskip\multitableparskip
-\newskip\multitableparindent
-\newdimen\multitablecolspace
-\newskip\multitablelinespace
-\multitableparskip=0pt
-\multitableparindent=6pt
-\multitablecolspace=12pt
-\multitablelinespace=0pt
% Macros used to set up halign preamble:
%
@@ -4466,8 +4350,6 @@ $$%
\go
}
-% multitable-only commands.
-%
% @headitem starts a heading row, which we typeset in bold. Assignments
% have to be global since we are inside the implicit group of an
% alignment entry. \everycr below resets \everytab so we don't have to
@@ -4484,14 +4366,8 @@ $$%
% default for tables with no headings.
\let\headitemcrhook=\relax
%
-% A \tab used to include \hskip1sp. But then the space in a template
-% line is not enough. That is bad. So let's go back to just `&' until
-% we again encounter the problem the 1sp was intended to solve.
-% --karl, nathan@acm.org, 20apr99.
\def\tab{\checkenv\multitable &\the\everytab}%
-% @multitable ... @end multitable definitions:
-%
\newtoks\everytab % insert after every tab.
%
\envdef\multitable{%
@@ -4506,9 +4382,8 @@ $$%
%
\tolerance=9500
\hbadness=9500
- \setmultitablespacing
- \parskip=\multitableparskip
- \parindent=\multitableparindent
+ \parskip=0pt
+ \parindent=6pt
\overfullrule=0pt
\global\colcount=0
%
@@ -4538,47 +4413,24 @@ $$%
% continue for many paragraphs if desired.
\halign\bgroup &%
\global\advance\colcount by 1
- \multistrut
+ \strut
\vtop{%
- % Use the current \colcount to find the correct column width:
+ \advance\hsize by -1\leftskip
+ % Find the correct column width
\hsize=\expandafter\csname col\the\colcount\endcsname
%
- % In order to keep entries from bumping into each other
- % we will add a \leftskip of \multitablecolspace to all columns after
- % the first one.
- %
- % If a template has been used, we will add \multitablecolspace
- % to the width of each template entry.
- %
- % If the user has set preamble in terms of percent of \hsize we will
- % use that dimension as the width of the column, and the \leftskip
- % will keep entries from bumping into each other. Table will start at
- % left margin and final column will justify at right margin.
- %
- % Make sure we don't inherit \rightskip from the outer environment.
\rightskip=0pt
\ifnum\colcount=1
- % The first column will be indented with the surrounding text.
- \advance\hsize by\leftskip
+ \advance\hsize by\leftskip % Add indent of surrounding text
\else
- \ifsetpercent \else
- % If user has not set preamble in terms of percent of \hsize
- % we will advance \hsize by \multitablecolspace.
- \advance\hsize by \multitablecolspace
- \fi
- % In either case we will make \leftskip=\multitablecolspace:
- \leftskip=\multitablecolspace
+ % In order to keep entries from bumping into each other.
+ \leftskip=12pt
+ \ifsetpercent \else
+ % If a template has been used
+ \advance\hsize by \leftskip
+ \fi
\fi
- % Ignoring space at the beginning and end avoids an occasional spurious
- % blank line, when TeX decides to break the line at the space before the
- % box from the multistrut, so the strut ends up on a line by itself.
- % For example:
- % @multitable @columnfractions .11 .89
- % @item @code{#}
- % @tab Legal holiday which is valid in major parts of the whole country.
- % Is automatically provided with highlighting sequences respectively
- % marking characters.
- \noindent\ignorespaces##\unskip\multistrut
+ \noindent\ignorespaces##\unskip\strut
}\cr
}
\def\Emultitable{%
@@ -4587,31 +4439,6 @@ $$%
\global\setpercentfalse
}
-\def\setmultitablespacing{%
- \def\multistrut{\strut}% just use the standard line spacing
- %
- % Compute \multitablelinespace (if not defined by user) for use in
- % \multitableparskip calculation. We used define \multistrut based on
- % this, but (ironically) that caused the spacing to be off.
- % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
-\ifdim\multitablelinespace=0pt
-\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
-\global\advance\multitablelinespace by-\ht0
-\fi
-% Test to see if parskip is larger than space between lines of
-% table. If not, do nothing.
-% If so, set to same dimension as multitablelinespace.
-\ifdim\multitableparskip>\multitablelinespace
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
- % than skip between lines in the table.
-\fi%
-\ifdim\multitableparskip=0pt
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
- % than skip between lines in the table.
-\fi}
-
\message{conditionals,}
@@ -5225,30 +5052,29 @@ $$%
\let\lbracechar\{%
\let\rbracechar\}%
%
+ % Non-English letters.
+ \def\AA{AA}%
+ \def\AE{AE}%
+ \def\DH{DZZ}%
+ \def\L{L}%
+ \def\OE{OE}%
+ \def\O{O}%
+ \def\TH{TH}%
+ \def\aa{aa}%
+ \def\ae{ae}%
+ \def\dh{dzz}%
+ \def\exclamdown{!}%
+ \def\l{l}%
+ \def\oe{oe}%
+ \def\ordf{a}%
+ \def\ordm{o}%
+ \def\o{o}%
+ \def\questiondown{?}%
+ \def\ss{ss}%
+ \def\th{th}%
%
\let\do\indexnofontsdef
%
- % Non-English letters.
- \do\AA{AA}%
- \do\AE{AE}%
- \do\DH{DZZ}%
- \do\L{L}%
- \do\OE{OE}%
- \do\O{O}%
- \do\TH{TH}%
- \do\aa{aa}%
- \do\ae{ae}%
- \do\dh{dzz}%
- \do\exclamdown{!}%
- \do\l{l}%
- \do\oe{oe}%
- \do\ordf{a}%
- \do\ordm{o}%
- \do\o{o}%
- \do\questiondown{?}%
- \do\ss{ss}%
- \do\th{th}%
- %
\do\LaTeX{LaTeX}%
\do\TeX{TeX}%
%
@@ -7144,7 +6970,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% But \@ or @@ will get a plain @ character.
\envdef\tex{%
- \setupmarkupstyle{tex}%
+ \setregularquotes
\catcode `\\=0 \catcode `\{=1 \catcode `\}=2
\catcode `\$=3 \catcode `\&=4 \catcode `\#=6
\catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
@@ -7370,7 +7196,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% If you want all examples etc. small: @set dispenvsize small.
% If you want even small examples the full size: @set dispenvsize nosmall.
% This affects the following displayed environments:
-% @example, @display, @format, @lisp
+% @example, @display, @format, @lisp, @verbatim
%
\def\smallword{small}
\def\nosmallword{nosmall}
@@ -7416,9 +7242,9 @@ might help (with 'rm \jobname.?? \jobname.??s')%
%
\maketwodispenvdef{lisp}{example}{%
\nonfillstart
- \tt\setupmarkupstyle{example}%
+ \tt\setcodequotes
\let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
- \gobble % eat return
+ \parsearg\gobble
}
% @display/@smalldisplay: same as @lisp except keep current font.
%
@@ -7576,7 +7402,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\def\setupverb{%
\tt % easiest (and conventionally used) font for verbatim
\def\par{\leavevmode\endgraf}%
- \setupmarkupstyle{verb}%
+ \setcodequotes
\tabeightspaces
% Respect line breaks,
% print special symbols as themselves, and
@@ -7617,7 +7443,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\tt % easiest (and conventionally used) font for verbatim
\def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}%
\tabexpand
- \setupmarkupstyle{verbatim}%
+ \setcodequotes
% Respect line breaks,
% print special symbols as themselves, and
% make each space count.
@@ -8036,7 +7862,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% leave the code in, but it's strange for @var to lead to typewriter.
% Nowadays we recommend @code, since the difference between a ttsl hyphen
% and a tt hyphen is pretty tiny. @code also disables ?` !`.
- \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
+ \def\var##1{{\setregularquotes\ttslanted{##1}}}%
#1%
\sl\hyphenchar\font=45
}
@@ -8145,11 +7971,18 @@ might help (with 'rm \jobname.?? \jobname.??s')%
}
\fi
+\let\E=\expandafter
+
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
\newlinechar`\^^M
- \def\xeatspaces{\eatspaces}%
+ % expand the expansion of \eatleadingcr twice to maybe remove a leading
+ % newline (and \else and \fi tokens), then call \eatspaces on the result.
+ \def\xeatspaces##1{%
+ \E\E\E\E\E\E\E\eatspaces\E\E\E\E\E\E\E{\eatleadingcr##1%
+ }}%
+ \def\xempty##1{}%
%
% Process the macro body under the current catcode regime.
\scantokens{#1@comment}%
@@ -8202,6 +8035,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\unbrace{\gdef\trim@@@ #1 } #2@{#1}
}
+{\catcode`\^^M=\other%
+\gdef\eatleadingcr#1{\if\noexpand#1\noexpand^^M\else\E#1\fi}}%
+% Warning: this won't work for a delimited argument
+% or for an empty argument
+
% Trim a single trailing ^^M off a string.
{\catcode`\^^M=\other \catcode`\Q=3%
\gdef\eatcr #1{\eatcra #1Q^^MQ}%
@@ -8368,6 +8206,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\let\hash\relax
% \hash is redefined to `#' later to get it into definitions
\let\xeatspaces\relax
+ \let\xempty\relax
\parsemargdefxxx#1,;,%
\ifnum\paramno<10\relax\else
\paramno0\relax
@@ -8379,9 +8218,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\else \let\next=\parsemargdefxxx
\advance\paramno by 1
\expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
- {\xeatspaces{\hash\the\paramno}}%
+ {\xeatspaces{\hash\the\paramno\noexpand\xempty{}}}%
\edef\paramlist{\paramlist\hash\the\paramno,}%
\fi\next}
+% the \xempty{} is to give \eatleadingcr an argument in the case of an
+% empty macro argument.
% \parsemacbody, \parsermacbody
%
@@ -8970,7 +8811,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\else
\ifhavexrefs
% We (should) know the real title if we have the xref values.
- \def\printedrefname{\refx{#1-title}{}}%
+ \def\printedrefname{\refx{#1-title}}%
\else
% Otherwise just copy the Info node name.
\def\printedrefname{\ignorespaces #1}%
@@ -9064,7 +8905,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
\ifdim\wd\printedrefnamebox = 0pt
- \refx{#1-snt}{}%
+ \refx{#1-snt}%
\else
\printedrefname
\fi
@@ -9099,28 +8940,30 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\else
% Reference within this manual.
%
- % Only output a following space if the -snt ref is nonempty; for
- % @unnumbered and @anchor, it won't be.
- \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+ % Only output a following space if the -snt ref is nonempty, as the ref
+ % will be empty for @unnumbered and @anchor.
+ \setbox2 = \hbox{\ignorespaces \refx{#1-snt}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
%
% output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
- % But we always want a comma and a space:
- ,\space
- %
- % output the `page 3'.
- \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
- % Add a , if xref followed by a space
- \if\space\noexpand\tokenafterxref ,%
- \else\ifx\ \tokenafterxref ,% @TAB
- \else\ifx\*\tokenafterxref ,% @*
- \else\ifx\ \tokenafterxref ,% @SPACE
- \else\ifx\
- \tokenafterxref ,% @NL
- \else\ifx\tie\tokenafterxref ,% @tie
- \fi\fi\fi\fi\fi\fi
+ \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax
+ % But we always want a comma and a space:
+ ,\space
+ %
+ % output the `page 3'.
+ \turnoffactive \putwordpage\tie\refx{#1-pg}%
+ % Add a , if xref followed by a space
+ \if\space\noexpand\tokenafterxref ,%
+ \else\ifx\ \tokenafterxref ,% @TAB
+ \else\ifx\*\tokenafterxref ,% @*
+ \else\ifx\ \tokenafterxref ,% @SPACE
+ \else\ifx\
+ \tokenafterxref ,% @NL
+ \else\ifx\tie\tokenafterxref ,% @tie
+ \fi\fi\fi\fi\fi\fi
+ \fi
\fi\fi
\fi
\endlink
@@ -9187,9 +9030,8 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\fi\fi\fi
}
-% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX
-% is output afterwards if non-empty.
-\def\refx#1#2{%
+% \refx{NAME} - reference a cross-reference string named NAME.
+\def\refx#1{%
\requireauxfile
{%
\indexnofonts
@@ -9216,7 +9058,6 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% It's defined, so just use it.
\thisrefX
\fi
- #2% Output the suffix in any case.
}
% This is the macro invoked by entries in the aux file. Define a control
@@ -9326,10 +9167,10 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\catcode`\[=\other
\catcode`\]=\other
\catcode`\"=\other
- \catcode`\_=\other
- \catcode`\|=\other
- \catcode`\<=\other
- \catcode`\>=\other
+ \catcode`\_=\active
+ \catcode`\|=\active
+ \catcode`\<=\active
+ \catcode`\>=\active
\catcode`\$=\other
\catcode`\#=\other
\catcode`\&=\other
@@ -9550,7 +9391,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
\catcode`\^^M = 5 % in case we're inside an example
\normalturnoffactive % allow _ et al. in names
- \def\xprocessmacroarg{\eatspaces}% in case we are being used via a macro
+ \makevalueexpandable
% If the image is by itself, center it.
\ifvmode
\imagevmodetrue
@@ -9576,7 +9417,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% On the other hand, if we are in the case of @center @image, we don't
% want to start a paragraph, which will create a hsize-width box and
% eradicate the centering.
- \ifx\centersub\centerV\else \noindent \fi
+ \ifx\centersub\centerV \else \imageindent \fi
%
% Output the image.
\ifpdf
@@ -11603,7 +11444,7 @@ directory should work if nowhere else does.}
\let> = \activegtr
\let~ = \activetilde
\let^ = \activehat
- \markupsetuplqdefault \markupsetuprqdefault
+ \setregularquotes
\let\b = \strong
\let\i = \smartitalic
% in principle, all other definitions in \tex have to be undone too.
@@ -11662,8 +11503,7 @@ directory should work if nowhere else does.}
@let|=@normalverticalbar
@let~=@normaltilde
@let\=@ttbackslash
- @markupsetuplqdefault
- @markupsetuprqdefault
+ @setregularquotes
@unsepspaces
}
}
@@ -11756,8 +11596,7 @@ directory should work if nowhere else does.}
@c Do this last of all since we use ` in the previous @catcode assignments.
@catcode`@'=@active
@catcode`@`=@active
-@markupsetuplqdefault
-@markupsetuprqdefault
+@setregularquotes
@c Local variables:
@c eval: (add-hook 'before-save-hook 'time-stamp)
@@ -11770,3 +11609,4 @@ directory should work if nowhere else does.}
@c vim:sw=2:
@enablebackslashhack
+
diff --git a/lib/update-copyright b/lib/update-copyright
index d9b7f683a..fae3a5fb3 100755
--- a/lib/update-copyright
+++ b/lib/update-copyright
@@ -3,7 +3,7 @@
# Update an FSF copyright year list to include the current year.
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/lib/ylwrap b/lib/ylwrap
index d1533360b..e8ec109fa 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey@cygnus.com>.
#
diff --git a/m4/amversion.in b/m4/amversion.in
index 666278f88..c60fe9774 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,6 +1,6 @@
## -*- Autoconf -*-
## @configure_input@
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index bf142b58f..e71cdaaa6 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,6 +1,6 @@
## -*- Autoconf -*-
## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.3], [],
+m4_if([$1], [1.16.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.3])dnl
+[AM_AUTOMAKE_VERSION([1.16.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4
index 713488aa9..cf777d826 100644
--- a/m4/ar-lib.m4
+++ b/m4/ar-lib.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/as.m4 b/m4/as.m4
index 61d6edd0d..c736b3116 100644
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -1,6 +1,6 @@
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index d7f8d5daa..915ee3480 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -1,6 +1,6 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond-if.m4 b/m4/cond-if.m4
index e3f5e0055..7f39d6b25 100644
--- a/m4/cond-if.m4
+++ b/m4/cond-if.m4
@@ -1,6 +1,6 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond.m4 b/m4/cond.m4
index ab6c7a485..de30d1a7a 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -1,6 +1,6 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/depend.m4 b/m4/depend.m4
index 8b02da850..6d5569a94 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/depout.m4 b/m4/depout.m4
index d612876f1..57f6fef4b 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,6 +1,6 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index bd6a3969f..bd9c57440 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -3,7 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------- ##
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/extra-recurs.m4 b/m4/extra-recurs.m4
index 8457cb1b1..30b89793a 100644
--- a/m4/extra-recurs.m4
+++ b/m4/extra-recurs.m4
@@ -1,6 +1,6 @@
# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*-
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index ca86ea715..b81fc590a 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,7 +1,7 @@
# Check for Java compiler. -*- Autoconf -*-
# For now we only handle the GNU compiler.
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/init.m4 b/m4/init.m4
index ba73676c1..c5807d211 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,6 +1,6 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -64,7 +64,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -116,6 +116,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
[m4_define([AC_PROG_OBJCXX],
m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
AC_REQUIRE([AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index 2dfeb4ed7..7b5041956 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4
index a55126ca0..4bb04c123 100644
--- a/m4/internal/ac-config-macro-dirs.m4
+++ b/m4/internal/ac-config-macro-dirs.m4
@@ -4,7 +4,7 @@
# FIXME: keep in sync with the contents of the variable
# '$ac_config_macro_dirs_fallback' in aclocal.in.
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
index 4b0a04bfa..ad090ec8c 100644
--- a/m4/lead-dot.m4
+++ b/m4/lead-dot.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lex.m4 b/m4/lex.m4
index a63b8cf65..dbd7f8c4c 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -1,6 +1,6 @@
## Replacement for AC_PROG_LEX. -*- Autoconf -*-
## by Alexandre Oliva <oliva@dcc.unicamp.br>
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 64819e446..16d0a5900 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -3,7 +3,7 @@
## From Ulrich Drepper
## Almost entirely rewritten by Alexandre Oliva
## ------------------------
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/local.mk b/m4/local.mk
index 20585bca1..a16356e44 100644
--- a/m4/local.mk
+++ b/m4/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index 476952a7d..bf96370f2 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -1,7 +1,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/make.m4 b/m4/make.m4
index 5fb3f4623..a711c2ff9 100644
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -1,6 +1,6 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/missing.m4 b/m4/missing.m4
index 14448bf18..c635ff2fe 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -1,6 +1,6 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 0b6cc410d..31e249a15 100644
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
index d71809ee5..79f3b234b 100644
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@ -2,7 +2,7 @@
# Obsolete and "removed" macros, that must however still report explicit
# error messages when used, to smooth transition.
#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/options.m4 b/m4/options.m4
index ff66c7db6..6af50d3e5 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -1,6 +1,6 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/prog-cc-c-o.m4 b/m4/prog-cc-c-o.m4
index 87ac95f51..ee2822e08 100644
--- a/m4/prog-cc-c-o.m4
+++ b/m4/prog-cc-c-o.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/python.m4 b/m4/python.m4
index b2302baa3..56d9eb2bb 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,7 +3,7 @@
## From Andrew Dalke
## Updated by James Henstridge and other contributors.
## ------------------------
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -93,16 +93,83 @@ AC_DEFUN([AM_PATH_PYTHON],
dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
- dnl Use the values of $prefix and $exec_prefix for the corresponding
+ dnl Use the values of sys.prefix and sys.exec_prefix for the corresponding
dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
dnl distinct variables so they can be overridden if need be. However,
dnl general consensus is that you shouldn't need this ability.
+ dnl Also allow directly setting the prefixes via configure args.
- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+ if test "x$prefix" = xNONE
+ then
+ am__usable_prefix=$ac_default_prefix
+ else
+ am__usable_prefix=$prefix
+ fi
+
+ AC_ARG_WITH([python_prefix],
+ [AS_HELP_STRING([--with-python_prefix],
+ [override the default PYTHON_PREFIX])],
+ [ am_python_prefix_subst="$withval"
+ am_cv_python_prefix="$withval"
+ AC_MSG_CHECKING([for $am_display_PYTHON prefix])
+ AC_MSG_RESULT([$am_cv_python_prefix])],
+ [
+ AC_CACHE_CHECK([for $am_display_PYTHON prefix], [am_cv_python_prefix],
+ [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`])
+
+ dnl If sys.prefix is a subdir of $prefix, replace the literal value of $prefix
+ dnl with a variable reference so it can be overridden.
+ case $am_cv_python_prefix in
+ $am__usable_prefix*)
+ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
+ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
+ ;;
+ *)
+ am_python_prefix_subst=$am_cv_python_prefix
+ ;;
+ esac
+ ])
+ AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst])
+
+ AC_ARG_WITH([python_exec_prefix],
+ [AS_HELP_STRING([--with-python_exec_prefix],
+ [override the default PYTHON_EXEC_PREFIX])],
+ [ am_python_exec_prefix_subst="$withval"
+ am_cv_python_exec_prefix="$withval"
+ AC_MSG_CHECKING([for $am_display_PYTHON exec_prefix])
+ AC_MSG_RESULT([$am_cv_python_exec_prefix])],
+ [
+ dnl --with-python_prefix was given - use its value for python_exec_prefix too
+ AS_IF([test -n "$with_python_prefix"], [am_python_exec_prefix_subst="$with_python_prefix"
+ am_cv_python_exec_prefix="$with_python_prefix"
+ AC_MSG_CHECKING([for $am_display_PYTHON exec_prefix])
+ AC_MSG_RESULT([$am_cv_python_exec_prefix])],
+ [
+ AC_CACHE_CHECK([for $am_display_PYTHON exec_prefix], [am_cv_python_exec_prefix],
+ [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`])
+ dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the
+ dnl literal value of $exec_prefix with a variable reference so it can
+ dnl be overridden.
+ if test "x$exec_prefix" = xNONE
+ then
+ am__usable_exec_prefix=$am__usable_prefix
+ else
+ am__usable_exec_prefix=$exec_prefix
+ fi
+ case $am_cv_python_exec_prefix in
+ $am__usable_exec_prefix*)
+ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+ ;;
+ *)
+ am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+ ;;
+ esac
+ ])])
+ AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst])
dnl At times (like when building shared libraries) you may want
dnl to know which OS platform Python thinks this is.
@@ -140,11 +207,11 @@ except ImportError:
dnl Query distutils for this directory.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [if test "x$prefix" = xNONE
+ [if test "x$am_cv_python_prefix" = x
then
- am_py_prefix=$ac_default_prefix
+ am_py_prefix=$am__usable_prefix
else
- am_py_prefix=$prefix
+ am_py_prefix=$am_cv_python_prefix
fi
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
@@ -157,13 +224,13 @@ sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
@@ -182,30 +249,30 @@ sys.stdout.write(sitedir)"`
dnl Query distutils for this directory.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [if test "x$exec_prefix" = xNONE
+ [if test "x$am_cv_python_exec_prefix" = x
then
- am_py_exec_prefix=$am_py_prefix
+ am_py_exec_prefix=$am__usable_exec_prefix
else
- am_py_exec_prefix=$exec_prefix
+ am_py_exec_prefix=$am_cv_python_exec_prefix
fi
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
diff --git a/m4/runlog.m4 b/m4/runlog.m4
index 42408cc68..6777dcf11 100644
--- a/m4/runlog.m4
+++ b/m4/runlog.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index a31d62b91..b2ce53390 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,6 +1,6 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/silent.m4 b/m4/silent.m4
index 376d49452..7d6036a68 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strip.m4 b/m4/strip.m4
index dac1abbb8..3335a097b 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index 6b5ee2d82..3aa3bacf9 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tar.m4 b/m4/tar.m4
index d81af3b05..23ae52f96 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -1,6 +1,6 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/upc.m4 b/m4/upc.m4
index 798f7670a..c80b92871 100644
--- a/m4/upc.m4
+++ b/m4/upc.m4
@@ -1,6 +1,6 @@
# Find a compiler for Unified Parallel C. -*- Autoconf -*-
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/vala.m4 b/m4/vala.m4
index 509904b11..4ee671dc6 100644
--- a/m4/vala.m4
+++ b/m4/vala.m4
@@ -1,6 +1,6 @@
# Autoconf support for the Vala compiler
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/maintainer/am-ft b/maintainer/am-ft
index 9fc6167f2..1be1f36ca 100755
--- a/maintainer/am-ft
+++ b/maintainer/am-ft
@@ -2,7 +2,7 @@
# Remote testing of Automake tarballs made easy.
# This script requires Bash 4.x or later.
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/maintainer/am-xft b/maintainer/am-xft
index cf4da4e43..13cd5d18d 100755
--- a/maintainer/am-xft
+++ b/maintainer/am-xft
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index c7f2b661c..ca8f6ead5 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -1,6 +1,6 @@
# Maintainer makefile rules for Automake.
#
-# Copyright (C) 1995-2020 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 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
diff --git a/maintainer/rename-tests b/maintainer/rename-tests
index d1a509fe8..991c57aba 100755
--- a/maintainer/rename-tests
+++ b/maintainer/rename-tests
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Convenience script to rename test cases in Automake.
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index a28158dc3..56f853888 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -1,6 +1,6 @@
# Maintainer checks for Automake. Requires GNU make.
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
@@ -415,7 +415,7 @@ sc_tests_overriding_macros_on_cmdline:
-e 's/ exp="[^"]*"/ /' \
-e 's/ exp=[^ ]/ /' \
$(filter-out %/am-test-lib.sh,$(xtests)) \
- | grep '\$$MAKE .*='; then \
+ | grep -E '\$$MAKE .*\S+='; then \
echo 'Rewrite "$$MAKE foo=bar" as "run_make foo=bar" in the lines above,'; \
echo 'it is more portable.'; \
exit 1; \
diff --git a/old/ChangeLog-tests b/old/ChangeLog-tests
index 502041f65..ccd34081f 100644
--- a/old/ChangeLog-tests
+++ b/old/ChangeLog-tests
@@ -1442,7 +1442,7 @@ Sat Feb 10 17:08:39 1996 Tom Tromey <tromey@creche.cygnus.com>
-----
-Copyright 2012-2020 Free Software Foundation, Inc.
+Copyright 2012-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.00 b/old/ChangeLog.00
index e47b51997..dd1270094 100644
--- a/old/ChangeLog.00
+++ b/old/ChangeLog.00
@@ -2205,7 +2205,7 @@
-----
-Copyright 1999-2020 Free Software Foundation, Inc.
+Copyright 1999-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.01 b/old/ChangeLog.01
index d01f39800..c297725c8 100644
--- a/old/ChangeLog.01
+++ b/old/ChangeLog.01
@@ -4931,7 +4931,7 @@
-----
-Copyright (C) 2001-2020 Free Software Foundation, Inc.
+Copyright (C) 2001-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.02 b/old/ChangeLog.02
index 09c6ed259..b1213a6d1 100644
--- a/old/ChangeLog.02
+++ b/old/ChangeLog.02
@@ -3219,7 +3219,7 @@
-----
-Copyright (C) 2002-2020 Free Software Foundation, Inc.
+Copyright (C) 2002-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.03 b/old/ChangeLog.03
index e50b02958..1697a83ed 100644
--- a/old/ChangeLog.03
+++ b/old/ChangeLog.03
@@ -2965,7 +2965,7 @@
-----
-Copyright (C) 2003-2020 Free Software Foundation, Inc.
+Copyright (C) 2003-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.04 b/old/ChangeLog.04
index 46dbfa7aa..cbe17f17f 100644
--- a/old/ChangeLog.04
+++ b/old/ChangeLog.04
@@ -1613,7 +1613,7 @@
-----
-Copyright (C) 2004-2020 Free Software Foundation, Inc.
+Copyright (C) 2004-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.09 b/old/ChangeLog.09
index 2655cb697..9318de8c4 100644
--- a/old/ChangeLog.09
+++ b/old/ChangeLog.09
@@ -5757,7 +5757,7 @@
-----
-Copyright (C) 2005-2020 Free Software Foundation, Inc.
+Copyright (C) 2005-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
index c87b2f137..8f037faca 100644
--- a/old/ChangeLog.11
+++ b/old/ChangeLog.11
@@ -13097,7 +13097,7 @@
-----
-Copyright (C) 2010-2020 Free Software Foundation, Inc.
+Copyright (C) 2010-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.96 b/old/ChangeLog.96
index 3fa521e3c..a0fded29e 100644
--- a/old/ChangeLog.96
+++ b/old/ChangeLog.96
@@ -3679,7 +3679,7 @@ Mon Sep 19 23:39:21 1994 djm <djm@cambric>
-----
-Copyright 1994-2020 Free Software Foundation, Inc.
+Copyright 1994-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.98 b/old/ChangeLog.98
index 5fba4bf59..4a41feedf 100644
--- a/old/ChangeLog.98
+++ b/old/ChangeLog.98
@@ -2185,7 +2185,7 @@ Thu Jan 2 14:16:17 1997 Tom Tromey <tromey@cygnus.com>
-----
-Copyright 1997-2020 Free Software Foundation, Inc.
+Copyright 1997-2021 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/TODO b/old/TODO
index 5011c6a7b..ec85d094f 100644
--- a/old/TODO
+++ b/old/TODO
@@ -483,7 +483,7 @@ that aren't mentioned?
* copyright notice
-Copyright 1994-2020 Free Software Foundation, Inc.
+Copyright 1994-2021 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
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 62ad473ed..50d614681 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright © 2017-2020 Free Software Foundation, Inc.
+# Copyright © 2017-2021 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
diff --git a/t/CheckListOfTests.am b/t/CheckListOfTests.am
index 12fd2ae3d..f55c17458 100644
--- a/t/CheckListOfTests.am
+++ b/t/CheckListOfTests.am
@@ -1,6 +1,6 @@
## -*- Automake -*-
##
-## Copyright (C) 2011-2020 Free Software Foundation, Inc.
+## Copyright (C) 2011-2021 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
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 54910aa80..d8e7991cd 100644
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/aclocal-I-and-install.sh b/t/aclocal-I-and-install.sh
index 5c14ae6eb..45408bb7a 100644
--- a/t/aclocal-I-and-install.sh
+++ b/t/aclocal-I-and-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-I-order-1.sh b/t/aclocal-I-order-1.sh
index 1e7aa2e0e..edd0775fa 100644
--- a/t/aclocal-I-order-1.sh
+++ b/t/aclocal-I-order-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index ee955a9bf..249910d35 100644
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index d1c84d96b..df2802975 100644
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index e18e02bc9..896a9a07d 100644
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index 76a843da7..4a4da9daf 100644
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-autoconf-version-check.sh b/t/aclocal-autoconf-version-check.sh
index c110136ee..24ebac245 100644
--- a/t/aclocal-autoconf-version-check.sh
+++ b/t/aclocal-autoconf-version-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/aclocal-comments-respected.sh b/t/aclocal-comments-respected.sh
index f7ea502b1..6e04f8dd5 100644
--- a/t/aclocal-comments-respected.sh
+++ b/t/aclocal-comments-respected.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index 9a828c99a..194483598 100644
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
index 5dd1ad822..c042072a4 100644
--- a/t/aclocal-deleted-header.sh
+++ b/t/aclocal-deleted-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/aclocal-deps-subdir.sh b/t/aclocal-deps-subdir.sh
index f50c29e37..3304b1f53 100644
--- a/t/aclocal-deps-subdir.sh
+++ b/t/aclocal-deps-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
index 73d3dbb45..032eabc0c 100644
--- a/t/aclocal-deps.sh
+++ b/t/aclocal-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-dirlist-abspath.sh b/t/aclocal-dirlist-abspath.sh
index a1baa2bef..3ba639cff 100644
--- a/t/aclocal-dirlist-abspath.sh
+++ b/t/aclocal-dirlist-abspath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/aclocal-dirlist-globbing.sh b/t/aclocal-dirlist-globbing.sh
index 94d44a8dc..ff13866cc 100644
--- a/t/aclocal-dirlist-globbing.sh
+++ b/t/aclocal-dirlist-globbing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
index e61ab7452..19748c2be 100644
--- a/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
index 180eba0d5..5051aa3a8 100644
--- a/t/aclocal-install-absdir.sh
+++ b/t/aclocal-install-absdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index b37f04d0f..28381f894 100644
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index 89133afb4..a371fdb4b 100644
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 0668551b4..dbac0c8ea 100644
--- a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/aclocal-m4-include-are-scanned.sh b/t/aclocal-m4-include-are-scanned.sh
index a17e14a9d..b93c00cb4 100644
--- a/t/aclocal-m4-include-are-scanned.sh
+++ b/t/aclocal-m4-include-are-scanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/aclocal-m4-sinclude.sh b/t/aclocal-m4-sinclude.sh
index ca9cbfd92..ae8832f30 100644
--- a/t/aclocal-m4-sinclude.sh
+++ b/t/aclocal-m4-sinclude.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
index b63c1c243..748f57fa1 100644
--- a/t/aclocal-macrodir.tap
+++ b/t/aclocal-macrodir.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-macrodirs.tap b/t/aclocal-macrodirs.tap
index 49cec8e13..fba6e6cad 100644
--- a/t/aclocal-macrodirs.tap
+++ b/t/aclocal-macrodirs.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-missing-macros.sh b/t/aclocal-missing-macros.sh
index 80ade3f44..41a2aac46 100644
--- a/t/aclocal-missing-macros.sh
+++ b/t/aclocal-missing-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/aclocal-no-extra-scan.sh b/t/aclocal-no-extra-scan.sh
index 5883df40b..df0e70416 100644
--- a/t/aclocal-no-extra-scan.sh
+++ b/t/aclocal-no-extra-scan.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/aclocal-no-force.sh b/t/aclocal-no-force.sh
index 8ab270e2a..bd34bdea4 100644
--- a/t/aclocal-no-force.sh
+++ b/t/aclocal-no-force.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index 05a76c664..7e357cc4e 100644
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aclocal-no-symlinked-overwrite.sh b/t/aclocal-no-symlinked-overwrite.sh
index b570e4b3e..e61a03d45 100644
--- a/t/aclocal-no-symlinked-overwrite.sh
+++ b/t/aclocal-no-symlinked-overwrite.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/aclocal-no-unused-required.sh b/t/aclocal-no-unused-required.sh
index 7584bed39..270b601e7 100644
--- a/t/aclocal-no-unused-required.sh
+++ b/t/aclocal-no-unused-required.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
index e38403cb2..938cf7ff0 100644
--- a/t/aclocal-path-install-serial.sh
+++ b/t/aclocal-path-install-serial.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
index 466831e43..2114c1ede 100644
--- a/t/aclocal-path-install.sh
+++ b/t/aclocal-path-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
index b775d8273..5e72d9bab 100644
--- a/t/aclocal-path-nonexistent.sh
+++ b/t/aclocal-path-nonexistent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index 412c7fb75..452068262 100644
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
index 903927c3f..ae8135804 100644
--- a/t/aclocal-path.sh
+++ b/t/aclocal-path.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index a3dfb7209..289df41d2 100644
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 04255f33d..2a7de639f 100644
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal-remake-misc.sh b/t/aclocal-remake-misc.sh
index 3cb2b9f89..5372daf2b 100644
--- a/t/aclocal-remake-misc.sh
+++ b/t/aclocal-remake-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/aclocal-req.sh b/t/aclocal-req.sh
index 1accb5fcc..720d88bee 100644
--- a/t/aclocal-req.sh
+++ b/t/aclocal-req.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/aclocal-scan-configure-ac-pr319.sh b/t/aclocal-scan-configure-ac-pr319.sh
index f78481960..05e5430c6 100644
--- a/t/aclocal-scan-configure-ac-pr319.sh
+++ b/t/aclocal-scan-configure-ac-pr319.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/aclocal-serial.sh b/t/aclocal-serial.sh
index 2115571a1..fe54fac0a 100644
--- a/t/aclocal-serial.sh
+++ b/t/aclocal-serial.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/aclocal-underquoted-defun.sh b/t/aclocal-underquoted-defun.sh
index 9c779c971..ebfdfd503 100644
--- a/t/aclocal-underquoted-defun.sh
+++ b/t/aclocal-underquoted-defun.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 677140897..2e2eb2439 100644
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aclocal.sh b/t/aclocal.sh
index 51bd5d7f8..12b21486b 100644
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/acsilent.sh b/t/acsilent.sh
index fae0a45da..b32c2b187 100644
--- a/t/acsilent.sh
+++ b/t/acsilent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/acsubst.sh b/t/acsubst.sh
index 72fc221b1..22eb33298 100644
--- a/t/acsubst.sh
+++ b/t/acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index 191a3abd6..8182c4603 100644
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/add-missing-install-sh.sh b/t/add-missing-install-sh.sh
index 03395d357..4d0a86f57 100644
--- a/t/add-missing-install-sh.sh
+++ b/t/add-missing-install-sh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/add-missing-multiple.sh b/t/add-missing-multiple.sh
index 760e22d07..3d8f41ea0 100644
--- a/t/add-missing-multiple.sh
+++ b/t/add-missing-multiple.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/add-missing.tap b/t/add-missing.tap
index d056a5d2d..39734772d 100644
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/all.sh b/t/all.sh
index 06eba04ca..a74e0c170 100644
--- a/t/all.sh
+++ b/t/all.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/all2.sh b/t/all2.sh
index f7a7cfb8a..38a85b833 100644
--- a/t/all2.sh
+++ b/t/all2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/alloca.sh b/t/alloca.sh
index f3420fdf9..0f3fc973e 100644
--- a/t/alloca.sh
+++ b/t/alloca.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/alloca2.sh b/t/alloca2.sh
index 876f43af1..8866342a2 100644
--- a/t/alloca2.sh
+++ b/t/alloca2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/alpha.sh b/t/alpha.sh
index 6c6481e9c..f8c6b7132 100644
--- a/t/alpha.sh
+++ b/t/alpha.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/alpha2.sh b/t/alpha2.sh
index 51489cd59..4665af4cc 100644
--- a/t/alpha2.sh
+++ b/t/alpha2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/am-config-header.sh b/t/am-config-header.sh
index 05bbf0b7e..9a239d01d 100644
--- a/t/am-config-header.sh
+++ b/t/am-config-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
index 8a1469392..c6c84dcc9 100644
--- a/t/am-default-source-ext.sh
+++ b/t/am-default-source-ext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/am-include-only-one-generated-fragment.sh b/t/am-include-only-one-generated-fragment.sh
index 8a903e9df..8c2fab67a 100644
--- a/t/am-include-only-one-generated-fragment.sh
+++ b/t/am-include-only-one-generated-fragment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/am-macro-not-found.sh b/t/am-macro-not-found.sh
index d91148a7c..e74722b2c 100644
--- a/t/am-macro-not-found.sh
+++ b/t/am-macro-not-found.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
index 1a5cb7fa5..8ca19df5d 100644
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
index bca85ff32..9f66c8ffc 100644
--- a/t/am-prog-cc-c-o.sh
+++ b/t/am-prog-cc-c-o.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/am-prog-cc-stdc.sh b/t/am-prog-cc-stdc.sh
index 1c8c87610..d38f761b7 100644
--- a/t/am-prog-cc-stdc.sh
+++ b/t/am-prog-cc-stdc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
index 6e514d4ab..ddbfd12c6 100644
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/amassign.sh b/t/amassign.sh
index 65ba57d21..90b786ac2 100644
--- a/t/amassign.sh
+++ b/t/amassign.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index 6d45ab77d..361cba710 100644
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
index 77007057c..008b5f587 100644
--- a/t/amhello-cflags.sh
+++ b/t/amhello-cflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
index 8cc3a8d02..3fb56fe36 100644
--- a/t/amhello-cross-compile.sh
+++ b/t/amhello-cross-compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index ec9efe098..bc3dae8e4 100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh
index f2c995b75..b310eefec 100644
--- a/t/aminit-trailing-dnl-comment-pr16841.sh
+++ b/t/aminit-trailing-dnl-comment-pr16841.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/amopt.sh b/t/amopt.sh
index 956fde394..8039f1576 100644
--- a/t/amopt.sh
+++ b/t/amopt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
index 885a642a3..1fbca1fd2 100644
--- a/t/amopts-location.sh
+++ b/t/amopts-location.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
index 88f7071ba..8360d1322 100644
--- a/t/amopts-variable-expansion.sh
+++ b/t/amopts-variable-expansion.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/amsubst.sh b/t/amsubst.sh
index c200cb6f1..11b4479e1 100644
--- a/t/amsubst.sh
+++ b/t/amsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index df399e481..35fecf9ce 100644
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
index 830018380..8ebd3eb56 100644
--- a/t/ar-lib.sh
+++ b/t/ar-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
index 469937230..adc0a1f1d 100644
--- a/t/ar-lib2.sh
+++ b/t/ar-lib2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
index 1029aa526..b624752c5 100644
--- a/t/ar-lib3.sh
+++ b/t/ar-lib3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
index 443906d76..af22e8819 100644
--- a/t/ar-lib4.sh
+++ b/t/ar-lib4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
index 4f4f1a779..3dcda33de 100644
--- a/t/ar-lib5a.sh
+++ b/t/ar-lib5a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index 3475b1f0e..1c3325008 100644
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
index 370541cbe..ee14af6a7 100644
--- a/t/ar-lib6a.sh
+++ b/t/ar-lib6a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
index 0a7a98ab1..a0e9ad191 100644
--- a/t/ar-lib6b.sh
+++ b/t/ar-lib6b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
index f632fa6f9..055dd84c0 100644
--- a/t/ar-lib7.sh
+++ b/t/ar-lib7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar.sh b/t/ar.sh
index 481d1122d..bde0e0170 100644
--- a/t/ar.sh
+++ b/t/ar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ar2.sh b/t/ar2.sh
index 4b293e838..7ceae29ae 100644
--- a/t/ar2.sh
+++ b/t/ar2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/ar3.sh b/t/ar3.sh
index d0b059c74..875fd9ef3 100644
--- a/t/ar3.sh
+++ b/t/ar3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar4.sh b/t/ar4.sh
index 1c229f1ba..1b6c163a8 100644
--- a/t/ar4.sh
+++ b/t/ar4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ar5.sh b/t/ar5.sh
index 3034c42e6..872b94d4f 100644
--- a/t/ar5.sh
+++ b/t/ar5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/asm.sh b/t/asm.sh
index 26dadbc4d..24de27e59 100644
--- a/t/asm.sh
+++ b/t/asm.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/asm2.sh b/t/asm2.sh
index d7751e77a..6a65a7bdb 100644
--- a/t/asm2.sh
+++ b/t/asm2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/asm3.sh b/t/asm3.sh
index b7f9f4678..aa6249e0d 100644
--- a/t/asm3.sh
+++ b/t/asm3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/autodist-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh
index 8ed8546f2..4194e919a 100644
--- a/t/autodist-acconfig-no-subdir.sh
+++ b/t/autodist-acconfig-no-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-acconfig.sh b/t/autodist-acconfig.sh
index cd9845562..2d867c67e 100644
--- a/t/autodist-acconfig.sh
+++ b/t/autodist-acconfig.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index 0a128c6ac..eead7e98b 100644
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
index 3509116ed..04c76138d 100644
--- a/t/autodist-config-headers.sh
+++ b/t/autodist-config-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh
index 213f6423d..48d95247e 100644
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
index 84a1769b5..03175f6e7 100644
--- a/t/autodist-no-duplicate.sh
+++ b/t/autodist-no-duplicate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index aef8f686b..b9e79f662 100644
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -32,6 +32,10 @@ test: all distdir
ls -l $(distdir)
echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
test -f $(distdir)/stamp-vti
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
cat > foo.texi << 'END'
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index 10bfc387b..d2c04865a 100644
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autodist.sh b/t/autodist.sh
index 1c2196e1f..244fcc3d7 100644
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index 579127b9f..a513e1f06 100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/autohdr.sh b/t/autohdr.sh
index 907d1e6d2..760548980 100644
--- a/t/autohdr.sh
+++ b/t/autohdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
index f97b66fe0..efe06f33b 100644
--- a/t/autohdr3.sh
+++ b/t/autohdr3.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
index 0751b60b8..d7201934a 100644
--- a/t/autohdr4.sh
+++ b/t/autohdr4.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
index 19ed3bd8f..4b9cb09bf 100644
--- a/t/autohdrdry.sh
+++ b/t/autohdrdry.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
index 44538deed..fda3b770b 100644
--- a/t/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
index 4b13bb5e9..27a0c3345 100644
--- a/t/auxdir-autodetect.sh
+++ b/t/auxdir-autodetect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/auxdir-cc-pr15981.sh b/t/auxdir-cc-pr15981.sh
index 8e0653625..184f505a3 100644
--- a/t/auxdir-cc-pr15981.sh
+++ b/t/auxdir-cc-pr15981.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
index 73ffb9e3c..607aaaf6b 100644
--- a/t/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
index b7a2e3a38..e5215a6f5 100644
--- a/t/auxdir-misplaced.sh
+++ b/t/auxdir-misplaced.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
index e4c39d01d..5066a9c1d 100644
--- a/t/auxdir-nonexistent.sh
+++ b/t/auxdir-nonexistent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/auxdir-pr15981.sh b/t/auxdir-pr15981.sh
index 6ade6ce3a..ffe3b68c7 100644
--- a/t/auxdir-pr15981.sh
+++ b/t/auxdir-pr15981.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/auxdir-pr19311.sh b/t/auxdir-pr19311.sh
index 8f0d3bd0a..a516319e6 100644
--- a/t/auxdir-pr19311.sh
+++ b/t/auxdir-pr19311.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
index 821527d0f..e3bf04248 100644
--- a/t/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/auxdir.sh b/t/auxdir.sh
index 14563cc2e..53b036c24 100644
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index 61fd8d436..e23130369 100644
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index 40d9a2dcb..bc14a625f 100644
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index 33cc53f78..aab893ee0 100644
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index ea032720d..547b82bd4 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index c185dfbab..7eb81922d 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -1,5 +1,5 @@
#! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/deltree.pl b/t/ax/deltree.pl
index ab040dc26..44bdd62ac 100644
--- a/t/ax/deltree.pl
+++ b/t/ax/deltree.pl
@@ -2,7 +2,7 @@
# deltree: recursively removes file and directory,
# trying to handle permissions and other complications.
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index 5a9212cce..8e99e522b 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 45e4ab657..edb0b7d70 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -1,6 +1,6 @@
## Data files for some tests. Not used in the automake build system.
##
-## Copyright (C) 2011-2020 Free Software Foundation, Inc.
+## Copyright (C) 2011-2021 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
diff --git a/t/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl
index a8dfb7b00..bd4ae4f87 100644
--- a/t/ax/extract-testsuite-summary.pl
+++ b/t/ax/extract-testsuite-summary.pl
@@ -2,7 +2,7 @@
# Extract the testsuite summary generated by the parallel testsuite
# harness from the output of "make check".
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/is b/t/ax/is
index e4183f627..943e864c2 100755
--- a/t/ax/is
+++ b/t/ax/is
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/is_newest b/t/ax/is_newest
index eff689578..195c2e5d7 100755
--- a/t/ax/is_newest
+++ b/t/ax/is_newest
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/runtest.in b/t/ax/runtest.in
index 26d76acaa..549aec076 100644
--- a/t/ax/runtest.in
+++ b/t/ax/runtest.in
@@ -1,7 +1,7 @@
#!@AM_TEST_RUNNER_SHELL@
# @configure_input@
#
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/shell-no-trail-bslash.in b/t/ax/shell-no-trail-bslash.in
index 9fec4e21b..22ef6f6ae 100644
--- a/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@ -1,5 +1,5 @@
#! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index 6be56e348..15c6b0e9f 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index a1ba39a2b..0adfe8570 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 4144ec43a..f56c04403 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index dff88b73c..c404b0e06 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -1,7 +1,7 @@
# -*- shell-script -*-
# @configure_input@
#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index 043775104..dd39b99af 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 69e98fb0b..e69d9161f 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 0b5967a48..b89005f66 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ax/trivial-test-driver b/t/ax/trivial-test-driver
index 9f53e354b..1d69b8c69 100644
--- a/t/ax/trivial-test-driver
+++ b/t/ax/trivial-test-driver
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/backcompat-acout.sh b/t/backcompat-acout.sh
index 3e6b7a287..6f4268b53 100644
--- a/t/backcompat-acout.sh
+++ b/t/backcompat-acout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/backcompat.sh b/t/backcompat.sh
index 900e623e9..4bcd10160 100644
--- a/t/backcompat.sh
+++ b/t/backcompat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
index defaf48ac..1565bcf38 100644
--- a/t/backcompat2.sh
+++ b/t/backcompat2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
index e748ed61e..e4933d7dd 100644
--- a/t/backcompat3.sh
+++ b/t/backcompat3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index ac492299b..ea9504921 100644
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/backslash-before-trailing-whitespace.sh b/t/backslash-before-trailing-whitespace.sh
index 4d5d53ac9..a06abb4e0 100644
--- a/t/backslash-before-trailing-whitespace.sh
+++ b/t/backslash-before-trailing-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
index 3dc1d3009..daa03ce55 100644
--- a/t/backslash-issues.sh
+++ b/t/backslash-issues.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/badline.sh b/t/badline.sh
index e823c8665..3d6dfbd5b 100644
--- a/t/badline.sh
+++ b/t/badline.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/badopt.sh b/t/badopt.sh
index de9c631d2..ae1a29693 100644
--- a/t/badopt.sh
+++ b/t/badopt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/badprog.sh b/t/badprog.sh
index 24d74f082..360bbb2a4 100644
--- a/t/badprog.sh
+++ b/t/badprog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
index 54adf0c0e..be7fba51e 100644
--- a/t/built-sources-check.sh
+++ b/t/built-sources-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
index 428b6397f..7e8131730 100644
--- a/t/built-sources-cond.sh
+++ b/t/built-sources-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/built-sources-fork-bomb.sh b/t/built-sources-fork-bomb.sh
index 736ce8d2f..ba2f8f721 100644
--- a/t/built-sources-fork-bomb.sh
+++ b/t/built-sources-fork-bomb.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/built-sources-install-exec.sh b/t/built-sources-install-exec.sh
index 47c7f1ae9..3c757e9d0 100755
--- a/t/built-sources-install-exec.sh
+++ b/t/built-sources-install-exec.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
index f5109a4da..6b15c3ddf 100644
--- a/t/built-sources-install.sh
+++ b/t/built-sources-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
index b6efc3b50..2dc70f06c 100644
--- a/t/built-sources-subdir.sh
+++ b/t/built-sources-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/built-sources.sh b/t/built-sources.sh
index 818989545..4768a8dfe 100644
--- a/t/built-sources.sh
+++ b/t/built-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/c-demo.sh b/t/c-demo.sh
index c00df4f89..34000369f 100644
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/candist.sh b/t/candist.sh
index 3b910ab0c..83d752c13 100644
--- a/t/candist.sh
+++ b/t/candist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/canon-name.sh b/t/canon-name.sh
index c3ec75593..deb7200ec 100644
--- a/t/canon-name.sh
+++ b/t/canon-name.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/canon.sh b/t/canon.sh
index 24e24d78a..836181e32 100644
--- a/t/canon.sh
+++ b/t/canon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/canon2.sh b/t/canon2.sh
index a486dbf8b..88e34b4f8 100644
--- a/t/canon2.sh
+++ b/t/canon2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/canon3.sh b/t/canon3.sh
index 4f6d30e7f..e9ada8fe1 100644
--- a/t/canon3.sh
+++ b/t/canon3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/canon4.sh b/t/canon4.sh
index 51429f6dd..c2e229a69 100644
--- a/t/canon4.sh
+++ b/t/canon4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/canon5.sh b/t/canon5.sh
index 15a550b0e..000a85d32 100644
--- a/t/canon5.sh
+++ b/t/canon5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/canon6.sh b/t/canon6.sh
index 8786c26a7..254271610 100644
--- a/t/canon6.sh
+++ b/t/canon6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/canon7.sh b/t/canon7.sh
index 7aa4d0e3a..fcbebf8b9 100644
--- a/t/canon7.sh
+++ b/t/canon7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/canon8.sh b/t/canon8.sh
index ab5a3a441..4860c66d3 100644
--- a/t/canon8.sh
+++ b/t/canon8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/ccnoco-deps.sh b/t/ccnoco-deps.sh
index fed0f70df..c75c3af16 100755
--- a/t/ccnoco-deps.sh
+++ b/t/ccnoco-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/ccnoco-lib.sh b/t/ccnoco-lib.sh
index f7aa09452..5099ecf48 100755
--- a/t/ccnoco-lib.sh
+++ b/t/ccnoco-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ccnoco-lt.sh b/t/ccnoco-lt.sh
index 8b894a60b..834347c98 100755
--- a/t/ccnoco-lt.sh
+++ b/t/ccnoco-lt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index d336775b8..5bab124fc 100644
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index 3e6b5eed1..2d358443d 100644
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index a96256ab6..7d2b115d2 100644
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index d3dfe3fe4..37fa476ca 100644
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
index 781f75c1d..8e1768fa2 100644
--- a/t/check-exported-srcdir.sh
+++ b/t/check-exported-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
index f35c164e7..6568db19c 100644
--- a/t/check-fd-redirect.sh
+++ b/t/check-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
index d3d28c840..6d142ad14 100644
--- a/t/check-no-test-driver.sh
+++ b/t/check-no-test-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
index 4eec3e530..5d2f6c371 100644
--- a/t/check-subst-prog.sh
+++ b/t/check-subst-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/check-subst.sh b/t/check-subst.sh
index e6a74e033..3615d610b 100644
--- a/t/check-subst.sh
+++ b/t/check-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
index 1b7c191e0..f0ac8dcb2 100644
--- a/t/check-tests-in-builddir.sh
+++ b/t/check-tests-in-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/check.sh b/t/check.sh
index 8ad3ef263..10e4bbee0 100644
--- a/t/check.sh
+++ b/t/check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/check10.sh b/t/check10.sh
index ab7332afa..9a2e35d99 100644
--- a/t/check10.sh
+++ b/t/check10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/check11.sh b/t/check11.sh
index 113172161..d40c55878 100644
--- a/t/check11.sh
+++ b/t/check11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/check12.sh b/t/check12.sh
index 470cfc474..e1621840e 100644
--- a/t/check12.sh
+++ b/t/check12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
@@ -22,6 +22,7 @@ required=runtest
. test-init.sh
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
@@ -56,12 +57,17 @@ B_EXIT_STATUS=0; export B_EXIT_STATUS
## DejaGnu tests.
cat >> Makefile.am << 'END'
-AUTOMAKE_OPTIONS += dejagnu
+SUBDIRS = testsuite
+EXTRA_DIST += hammer spanner
+END
+
+mkdir testsuite
+
+cat >> testsuite/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = hammer spanner
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
-EXTRA_DIST += $(DEJATOOL)
-EXTRA_DIST += hammer.test/hammer.exp
-EXTRA_DIST += spanner.test/spanner.exp
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner
+EXTRA_DIST = hammer.test/hammer.exp spanner.test/spanner.exp
END
cat > hammer << 'END'
@@ -77,9 +83,9 @@ echo "I'm a right spanner!"
END
chmod +x hammer spanner
-mkdir hammer.test spanner.test
+mkdir testsuite/hammer.test testsuite/spanner.test
-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
set test test_hammer
spawn $HAMMER
expect {
@@ -88,7 +94,7 @@ expect {
}
END
-cat > spanner.test/spanner.exp << 'END'
+cat > testsuite/spanner.test/spanner.exp << 'END'
set test test_spanner
spawn $SPANNER
expect {
@@ -133,10 +139,10 @@ for vpath in : false; do
$srcdir/configure
$MAKE check
- test -f hammer.log
- test -f hammer.sum
- test -f spanner.log
- test -f spanner.sum
+ test -f testsuite/hammer.log
+ test -f testsuite/hammer.sum
+ test -f testsuite/spanner.log
+ test -f testsuite/spanner.sum
if test x"$am_serial_tests" != x"yes"; then
test -f test-suite.log
test -f a.log
@@ -147,10 +153,10 @@ for vpath in : false; do
cp -f config.status config-status.sav
$MAKE distclean
- test ! -e hammer.log
- test ! -e hammer.sum
- test ! -e spanner.log
- test ! -e spanner.sum
+ test ! -e testsuite/hammer.log
+ test ! -e testsuite/hammer.sum
+ test ! -e testsuite/spanner.log
+ test ! -e testsuite/spanner.sum
test ! -e test-suite.log
test ! -e a.log
test ! -e b.log
@@ -160,12 +166,12 @@ for vpath in : false; do
./config.status
NAIL=screw $MAKE check && exit 1
- test -f hammer.log
- test -f hammer.sum
- test -f spanner.log
- test -f spanner.sum
- grep 'FAIL: test_hammer' hammer.sum
- grep 'FAIL:' spanner.sum && exit 1
+ test -f testsuite/hammer.log
+ test -f testsuite/hammer.sum
+ test -f testsuite/spanner.log
+ test -f testsuite/spanner.sum
+ grep 'FAIL: test_hammer' testsuite/hammer.sum
+ grep 'FAIL:' testsuite/spanner.sum && exit 1
B_EXIT_STATUS=1 $MAKE check && exit 1
if test x"$am_serial_tests" != x"yes"; then
@@ -185,12 +191,12 @@ for vpath in : false; do
# Do not trust the exit status of 'make -k'.
NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || :
- test -f hammer.log
- test -f hammer.sum
- test -f spanner.log
- test -f spanner.sum
- grep 'FAIL: test_hammer' hammer.sum
- grep 'FAIL:' spanner.sum && exit 1
+ test -f testsuite/hammer.log
+ test -f testsuite/hammer.sum
+ test -f testsuite/spanner.log
+ test -f testsuite/spanner.sum
+ grep 'FAIL: test_hammer' testsuite/hammer.sum
+ grep 'FAIL:' testsuite/spanner.sum && exit 1
if test x"$am_serial_tests" != x"yes"; then
cat test-suite.log
cat a.log
diff --git a/t/check2.sh b/t/check2.sh
index 4ec3d9eb4..65fa17d25 100644
--- a/t/check2.sh
+++ b/t/check2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/check4.sh b/t/check4.sh
index f301fcd13..a0df25014 100644
--- a/t/check4.sh
+++ b/t/check4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/check5.sh b/t/check5.sh
index bd1e97a48..16bbc5454 100644
--- a/t/check5.sh
+++ b/t/check5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/check6.sh b/t/check6.sh
index 58849fb35..86f94e9bc 100644
--- a/t/check6.sh
+++ b/t/check6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/check7.sh b/t/check7.sh
index 44eb9a460..ef0a5a672 100644
--- a/t/check7.sh
+++ b/t/check7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/check8.sh b/t/check8.sh
index 73634e873..3c44808d5 100644
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/checkall.sh b/t/checkall.sh
index 04ea9c704..93dea8ce7 100644
--- a/t/checkall.sh
+++ b/t/checkall.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/clean.sh b/t/clean.sh
index e84cb6706..707daf8a6 100644
--- a/t/clean.sh
+++ b/t/clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/colneq.sh b/t/colneq.sh
index 7b987b15d..1adc1b6a3 100644
--- a/t/colneq.sh
+++ b/t/colneq.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/colneq2.sh b/t/colneq2.sh
index cb607ecf8..a6983a5d5 100644
--- a/t/colneq2.sh
+++ b/t/colneq2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/colneq3.sh b/t/colneq3.sh
index b44575406..46b6e5bc0 100644
--- a/t/colneq3.sh
+++ b/t/colneq3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/colon.sh b/t/colon.sh
index a2576f1e6..4199c9314 100644
--- a/t/colon.sh
+++ b/t/colon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/colon2.sh b/t/colon2.sh
index b7e98ed6d..12e70512b 100644
--- a/t/colon2.sh
+++ b/t/colon2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/colon3.sh b/t/colon3.sh
index 7fefe92c4..990dd1971 100644
--- a/t/colon3.sh
+++ b/t/colon3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/colon4.sh b/t/colon4.sh
index 654282a73..fa2b6b343 100644
--- a/t/colon4.sh
+++ b/t/colon4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/colon5.sh b/t/colon5.sh
index 27bdeacf0..ab1e48b1c 100644
--- a/t/colon5.sh
+++ b/t/colon5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/colon6.sh b/t/colon6.sh
index 6a6c7eb16..c0c01c976 100644
--- a/t/colon6.sh
+++ b/t/colon6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/colon7.sh b/t/colon7.sh
index 1eb146b12..0c5e95b9b 100644
--- a/t/colon7.sh
+++ b/t/colon7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/color-tests-opt.sh b/t/color-tests-opt.sh
index ddf339f55..627df00e4 100644
--- a/t/color-tests-opt.sh
+++ b/t/color-tests-opt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/color-tests.sh b/t/color-tests.sh
index a0bb9c685..e2c1bfa7d 100644
--- a/t/color-tests.sh
+++ b/t/color-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index 2aea32116..c9b1b787e 100644
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/commen10.sh b/t/commen10.sh
index c55cd1101..b484eab4b 100644
--- a/t/commen10.sh
+++ b/t/commen10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/commen11.sh b/t/commen11.sh
index 77f603bdc..425273162 100644
--- a/t/commen11.sh
+++ b/t/commen11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/comment-block.sh b/t/comment-block.sh
index 4b35931de..926982729 100644
--- a/t/comment-block.sh
+++ b/t/comment-block.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/comment.sh b/t/comment.sh
index d1d093b59..164c7eb21 100644
--- a/t/comment.sh
+++ b/t/comment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/comment2.sh b/t/comment2.sh
index 77887bdf3..3a39895b1 100644
--- a/t/comment2.sh
+++ b/t/comment2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/comment3.sh b/t/comment3.sh
index ad328e33f..4f7778d80 100644
--- a/t/comment3.sh
+++ b/t/comment3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/comment4.sh b/t/comment4.sh
index 1d1566656..ba8c31d41 100644
--- a/t/comment4.sh
+++ b/t/comment4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/comment5.sh b/t/comment5.sh
index 5f9819bc5..a8274b09b 100644
--- a/t/comment5.sh
+++ b/t/comment5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/comment6.sh b/t/comment6.sh
index 86452d041..aca40f6b2 100644
--- a/t/comment6.sh
+++ b/t/comment6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/comment7.sh b/t/comment7.sh
index 075fd3e34..22f7b8891 100644
--- a/t/comment7.sh
+++ b/t/comment7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/comment8.sh b/t/comment8.sh
index 9c7d1d50d..f7fbd640b 100644
--- a/t/comment8.sh
+++ b/t/comment8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/comment9.sh b/t/comment9.sh
index 1655d0aff..30dc8c062 100644
--- a/t/comment9.sh
+++ b/t/comment9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
index 879e80366..67627b8ce 100644
--- a/t/comments-in-var-def.sh
+++ b/t/comments-in-var-def.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/compile.sh b/t/compile.sh
index dd655d268..4cc12d24f 100644
--- a/t/compile.sh
+++ b/t/compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/compile2.sh b/t/compile2.sh
index 261298289..eb0bf2651 100644
--- a/t/compile2.sh
+++ b/t/compile2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/compile3.sh b/t/compile3.sh
index 296bfc607..48145ce8d 100644
--- a/t/compile3.sh
+++ b/t/compile3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/compile4.sh b/t/compile4.sh
index 6d4f4c892..7874c44c4 100644
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/compile5.sh b/t/compile5.sh
index 633b6077f..207c2a7b4 100644
--- a/t/compile5.sh
+++ b/t/compile5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/compile6.sh b/t/compile6.sh
index 7db5fbd45..800f3488d 100644
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/compile7.sh b/t/compile7.sh
index 645a44a89..469d97ae7 100644
--- a/t/compile7.sh
+++ b/t/compile7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
index 16f9f5134..72adebfea 100644
--- a/t/compile_f90_c_cxx.sh
+++ b/t/compile_f90_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index e0410c397..0004f0da0 100644
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
index 6338ad9a3..edd745dde 100644
--- a/t/cond-basic.sh
+++ b/t/cond-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond.sh b/t/cond.sh
index bb0313127..91614973a 100644
--- a/t/cond.sh
+++ b/t/cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/cond10.sh b/t/cond10.sh
index 5e2324e75..5559e1eb7 100644
--- a/t/cond10.sh
+++ b/t/cond10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond11.sh b/t/cond11.sh
index 752175148..f66a1efab 100644
--- a/t/cond11.sh
+++ b/t/cond11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond13.sh b/t/cond13.sh
index 61f2a37c9..5fb800874 100644
--- a/t/cond13.sh
+++ b/t/cond13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond14.sh b/t/cond14.sh
index bf7ad195e..13ef54276 100644
--- a/t/cond14.sh
+++ b/t/cond14.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond15.sh b/t/cond15.sh
index b3192b0f4..8009fdcb0 100644
--- a/t/cond15.sh
+++ b/t/cond15.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond16.sh b/t/cond16.sh
index 498bed1d0..6daa0e1c1 100644
--- a/t/cond16.sh
+++ b/t/cond16.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond17.sh b/t/cond17.sh
index 0e6433a9f..79633ca76 100644
--- a/t/cond17.sh
+++ b/t/cond17.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond18.sh b/t/cond18.sh
index 96a0a4d42..071c1829a 100644
--- a/t/cond18.sh
+++ b/t/cond18.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond19.sh b/t/cond19.sh
index 9b7ef7a6f..06f163ccb 100644
--- a/t/cond19.sh
+++ b/t/cond19.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond20.sh b/t/cond20.sh
index afb61906d..a64688d00 100644
--- a/t/cond20.sh
+++ b/t/cond20.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cond21.sh b/t/cond21.sh
index 75efb5338..03256b61e 100644
--- a/t/cond21.sh
+++ b/t/cond21.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond22.sh b/t/cond22.sh
index 0636109bb..a9f95cdd6 100644
--- a/t/cond22.sh
+++ b/t/cond22.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond23.sh b/t/cond23.sh
index 2bcf67a05..89a6d6af8 100644
--- a/t/cond23.sh
+++ b/t/cond23.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond24.sh b/t/cond24.sh
index 8a6cf937e..3868ae32e 100644
--- a/t/cond24.sh
+++ b/t/cond24.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond25.sh b/t/cond25.sh
index ee66a08a8..fc811049b 100644
--- a/t/cond25.sh
+++ b/t/cond25.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond26.sh b/t/cond26.sh
index 26ba9f81b..91382007d 100644
--- a/t/cond26.sh
+++ b/t/cond26.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond27.sh b/t/cond27.sh
index d1e27e156..b38a87131 100644
--- a/t/cond27.sh
+++ b/t/cond27.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond28.sh b/t/cond28.sh
index b81acb32f..d10db9a7c 100644
--- a/t/cond28.sh
+++ b/t/cond28.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond3.sh b/t/cond3.sh
index 98108a7e5..459330ce4 100644
--- a/t/cond3.sh
+++ b/t/cond3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/cond30.sh b/t/cond30.sh
index 5ea6a62c3..0606a18ad 100644
--- a/t/cond30.sh
+++ b/t/cond30.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/cond31.sh b/t/cond31.sh
index c8028df4f..1f9574f3b 100644
--- a/t/cond31.sh
+++ b/t/cond31.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/cond32.sh b/t/cond32.sh
index abd232d13..cb1214584 100644
--- a/t/cond32.sh
+++ b/t/cond32.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/cond33.sh b/t/cond33.sh
index b9171566d..b00b86f0a 100644
--- a/t/cond33.sh
+++ b/t/cond33.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/cond34.sh b/t/cond34.sh
index 559b854f9..6602b6760 100644
--- a/t/cond34.sh
+++ b/t/cond34.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/cond35.sh b/t/cond35.sh
index ef727d076..786bb3cf5 100644
--- a/t/cond35.sh
+++ b/t/cond35.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/cond36.sh b/t/cond36.sh
index 8b636640e..8cfb9d5f5 100644
--- a/t/cond36.sh
+++ b/t/cond36.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/cond37.sh b/t/cond37.sh
index c1d00a63d..80e9809d5 100644
--- a/t/cond37.sh
+++ b/t/cond37.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/cond38.sh b/t/cond38.sh
index d8bd9effb..512f592c5 100644
--- a/t/cond38.sh
+++ b/t/cond38.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/cond39.sh b/t/cond39.sh
index b13c4a141..444ca39bf 100644
--- a/t/cond39.sh
+++ b/t/cond39.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/cond4.sh b/t/cond4.sh
index 68feea300..1c6aaf66c 100644
--- a/t/cond4.sh
+++ b/t/cond4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cond40.sh b/t/cond40.sh
index 69a61a3c1..720789a05 100644
--- a/t/cond40.sh
+++ b/t/cond40.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/cond41.sh b/t/cond41.sh
index c6c93b62e..14f06ec91 100644
--- a/t/cond41.sh
+++ b/t/cond41.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/cond42.sh b/t/cond42.sh
index 998fe1d39..f7f87816a 100644
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -1,6 +1,6 @@
#!/bin/sh
nfig
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/cond43.sh b/t/cond43.sh
index 3b669b7b4..5e4232212 100644
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/cond44.sh b/t/cond44.sh
index f5557846a..d2ebed556 100644
--- a/t/cond44.sh
+++ b/t/cond44.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond45.sh b/t/cond45.sh
index a648bf7aa..3dd1b724b 100644
--- a/t/cond45.sh
+++ b/t/cond45.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cond46.sh b/t/cond46.sh
index 05e26fe2f..c6a079d8d 100644
--- a/t/cond46.sh
+++ b/t/cond46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/cond5.sh b/t/cond5.sh
index d65855acf..a47c928b2 100644
--- a/t/cond5.sh
+++ b/t/cond5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cond6.sh b/t/cond6.sh
index 579c3c82c..15cd6cd50 100644
--- a/t/cond6.sh
+++ b/t/cond6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cond7.sh b/t/cond7.sh
index c6331bcee..b9970bbc4 100644
--- a/t/cond7.sh
+++ b/t/cond7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cond8.sh b/t/cond8.sh
index bf44d65ce..63603455e 100644
--- a/t/cond8.sh
+++ b/t/cond8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/cond9.sh b/t/cond9.sh
index df0ac067c..e43e2d161 100644
--- a/t/cond9.sh
+++ b/t/cond9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/condd.sh b/t/condd.sh
index 3c3b89b71..ed3d54bea 100644
--- a/t/condd.sh
+++ b/t/condd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/condhook.sh b/t/condhook.sh
index 348a57737..996111bc3 100644
--- a/t/condhook.sh
+++ b/t/condhook.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/condhook2.sh b/t/condhook2.sh
index 69d5a6277..6e6d25be5 100644
--- a/t/condhook2.sh
+++ b/t/condhook2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/condinc.sh b/t/condinc.sh
index 2ba516395..d65982bbf 100644
--- a/t/condinc.sh
+++ b/t/condinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/condinc2.sh b/t/condinc2.sh
index dc0c1ddd1..847b19fe6 100644
--- a/t/condinc2.sh
+++ b/t/condinc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/condlib.sh b/t/condlib.sh
index 19ddfb25b..90e84c7d8 100644
--- a/t/condlib.sh
+++ b/t/condlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/condman2.sh b/t/condman2.sh
index 9fa5ac3c4..fd962f7e0 100644
--- a/t/condman2.sh
+++ b/t/condman2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/condman3.sh b/t/condman3.sh
index 8fff09264..2a65d9173 100644
--- a/t/condman3.sh
+++ b/t/condman3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/confdeps.sh b/t/confdeps.sh
index 4d58d8d88..877ab373d 100644
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/conff.sh b/t/conff.sh
index f8e773e4f..46419e5d2 100644
--- a/t/conff.sh
+++ b/t/conff.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/conff2.sh b/t/conff2.sh
index 4cf1628cb..012dd3eaa 100644
--- a/t/conff2.sh
+++ b/t/conff2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
index cafee7e4c..af6025624 100644
--- a/t/conffile-leading-dot.sh
+++ b/t/conffile-leading-dot.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
index 7b88bc0d0..d22adcd6f 100644
--- a/t/confh-subdir-clean.sh
+++ b/t/confh-subdir-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/confh.sh b/t/confh.sh
index d730201c9..97558e6ef 100644
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/confh4.sh b/t/confh4.sh
index 2a3132ac5..dd4a1b2dc 100644
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/confh5.sh b/t/confh5.sh
index 99792157c..f8b8544f0 100644
--- a/t/confh5.sh
+++ b/t/confh5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/confh6.sh b/t/confh6.sh
index 3270b6b71..cb878940f 100644
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/confh7.sh b/t/confh7.sh
index 6d6a889be..86d150252 100644
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/confh8.sh b/t/confh8.sh
index 13a3e7dc8..726ec0a09 100644
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/configure.sh b/t/configure.sh
index 72259475e..dfa4e2b22 100644
--- a/t/configure.sh
+++ b/t/configure.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/confincl.sh b/t/confincl.sh
index 4df955413..2baf041c5 100644
--- a/t/confincl.sh
+++ b/t/confincl.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/conflnk.sh b/t/conflnk.sh
index 9589a3797..513b8581d 100644
--- a/t/conflnk.sh
+++ b/t/conflnk.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index 89653e306..aaeeadc95 100644
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
index 652dd043b..686db5398 100644
--- a/t/conflnk3.sh
+++ b/t/conflnk3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
index f38c55b4a..2e76be4a5 100644
--- a/t/conflnk4.sh
+++ b/t/conflnk4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/confsub.sh b/t/confsub.sh
index 61728b0d5..533c36e86 100644
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/confvar.sh b/t/confvar.sh
index a83e4b4dc..79eb0d016 100644
--- a/t/confvar.sh
+++ b/t/confvar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/confvar2.sh b/t/confvar2.sh
index 3f8941184..ebd80ae0c 100644
--- a/t/confvar2.sh
+++ b/t/confvar2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/copy.sh b/t/copy.sh
index 4c5b55439..b4a94fd65 100644
--- a/t/copy.sh
+++ b/t/copy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/cscope.tap b/t/cscope.tap
index 081e04c65..45ecf20b4 100644
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/cscope2.sh b/t/cscope2.sh
index 394a53659..64da0c099 100644
--- a/t/cscope2.sh
+++ b/t/cscope2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/cscope3.sh b/t/cscope3.sh
index 3a112161a..07bf7249c 100644
--- a/t/cscope3.sh
+++ b/t/cscope3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index dad7dd368..4535e0d6a 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index d2badddad..24203836d 100644
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/cxx.sh b/t/cxx.sh
index ff3885c92..d43c24e1f 100644
--- a/t/cxx.sh
+++ b/t/cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/cxx2.sh b/t/cxx2.sh
index 38599a042..3a8cd3223 100644
--- a/t/cxx2.sh
+++ b/t/cxx2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index 70b418541..e30057a88 100644
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
index d9ab13835..3d7877e3d 100644
--- a/t/cxxlibobj.sh
+++ b/t/cxxlibobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
index 28dc0663c..bca4a0fa0 100644
--- a/t/cxxlink.sh
+++ b/t/cxxlink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/cxxnoc.sh b/t/cxxnoc.sh
index 1355c810b..b0a474056 100644
--- a/t/cxxnoc.sh
+++ b/t/cxxnoc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
index 4818e98a7..b6fa0554d 100644
--- a/t/cygnus-no-more.sh
+++ b/t/cygnus-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
index 9f27333a6..067cf8cf2 100644
--- a/t/cygwin32.sh
+++ b/t/cygwin32.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/dash.sh b/t/dash.sh
index 7a8c12c9b..483b125c5 100644
--- a/t/dash.sh
+++ b/t/dash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/defun.sh b/t/defun.sh
index 6cc53cace..4c5e48d6c 100644
--- a/t/defun.sh
+++ b/t/defun.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/defun2.sh b/t/defun2.sh
index 265437f1a..d686b458c 100644
--- a/t/defun2.sh
+++ b/t/defun2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
index 1c2d1fb9d..0bddb8e3e 100644
--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -21,18 +21,25 @@ required=runtest
. test-init.sh
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = tcl env
EXTRA_DIST = tcl.test/tcl.exp
END
-mkdir tcl.test
+mkdir testsuite/tcl.test
-cat > tcl.test/tcl.exp << 'END'
+cat > testsuite/tcl.test/tcl.exp << 'END'
send_user "tcl_objdir: $objdir\n"
if { [ regexp "^/" $objdir ] } {
pass "test_tcl_objdir"
@@ -50,10 +57,10 @@ $AUTOMAKE --add-missing
$MAKE check
# Sanity check: all tests have run.
-test -f env.log
-test -f env.sum
-test -f tcl.log
-test -f tcl.sum
+test -f testsuite/env.log
+test -f testsuite/env.sum
+test -f testsuite/tcl.log
+test -f testsuite/tcl.sum
$MAKE distcheck
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
index a76ca0ddb..6bab70b12 100644
--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -21,44 +21,52 @@ required=runtest
. test-init.sh
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = tcl env
-EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp lib/tcl.exp
+EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp
+EXTRA_DIST += lib/tcl.exp
END
-mkdir env.test tcl.test lib
+mkdir testsuite/env.test testsuite/tcl.test testsuite/lib
# DejaGnu can change $srcdir behind our backs, so we have to
# save its original value. Thanks to Ian Lance Taylor for the
# suggestion.
-cat > lib/tcl.exp << 'END'
+cat > testsuite/lib/tcl.exp << 'END'
send_user "tcl_lib_srcdir: $srcdir\n"
set orig_srcdir $srcdir
END
-cat > env.test/env.exp << 'END'
+cat > testsuite/env.test/env.exp << 'END'
set env_srcdir $env(srcdir)
send_user "env_srcdir: $env_srcdir\n"
-if { [ regexp "^\.(\./\.\.)?$" $env_srcdir ] } {
+if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $env_srcdir ] } {
pass "test_env_src"
} else {
fail "test_env_src"
}
END
-cat > tcl.test/tcl.exp << 'END'
+cat > testsuite/tcl.test/tcl.exp << 'END'
send_user "tcl_srcdir: $srcdir\n"
-if { [ regexp "^\.(\./\.\.)?$" $srcdir ] } {
+if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $srcdir ] } {
pass "test_tcl_src"
} else {
fail "test_tcl_src"
}
send_user "tcl_orig_srcdir: $orig_srcdir\n"
-if { [ regexp "^\.(\./\.\.)?$" $orig_srcdir ] } {
+if { [ regexp "^\.(\./\.\./\.\./testsuite)?$" $orig_srcdir ] } {
pass "test_tcl_orig_src"
} else {
fail "test_tcl_orig_src"
@@ -74,10 +82,10 @@ $AUTOMAKE --add-missing
$MAKE check
# Sanity check: all tests have run.
-test -f env.log
-test -f env.sum
-test -f tcl.log
-test -f tcl.sum
+test -f testsuite/env.log
+test -f testsuite/env.sum
+test -f testsuite/tcl.log
+test -f testsuite/tcl.sum
$MAKE distcheck
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
index ef51eaedc..9dc527874 100644
--- a/t/dejagnu-siteexp-append.sh
+++ b/t/dejagnu-siteexp-append.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
index acc524372..67e58c752 100644
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -33,10 +33,17 @@ END
}
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = tool
@@ -46,11 +53,11 @@ EXTRA_DEJAGNU_SITE_CONFIG = foo.exp
EXTRA_DIST += foo.exp
END
-echo 'set foo "/foo/"' > foo.exp
+echo 'set foo "/foo/"' > testsuite/foo.exp
-mkdir tool.test
-write_check_for foo > tool.test/tool.exp
-cat tool.test/tool.exp
+mkdir testsuite/tool.test
+write_check_for foo > testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
$ACLOCAL
$AUTOCONF
@@ -59,31 +66,31 @@ $AUTOMAKE --add-missing
./configure
$MAKE check
-cat foo.exp
-cat site.exp
-grep 'PASS: test_foo' tool.sum
+cat testsuite/foo.exp
+cat testsuite/site.exp
+grep 'PASS: test_foo' testsuite/tool.sum
-write_check_for bar >> tool.test/tool.exp
-write_check_for baz >> tool.test/tool.exp
-cat tool.test/tool.exp
+write_check_for bar >> testsuite/tool.test/tool.exp
+write_check_for baz >> testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
# Ensure that foo.exp will be newer than site.exp, which will
# thus have to be remade.
$sleep
# With this, below we'll also check that settings in files coming later in
# $(EXTRA_DEJAGNU_SITE_CONFIG) override those in files coming earlier.
-cat >> foo.exp <<'END'
+cat >> testsuite/foo.exp <<'END'
set bar "/foo/"
set baz "/foo/"
set qux "/foo/"
END
-$MAKE check && { cat site.exp; exit 1; }
-grep 'PASS: test_foo' tool.sum
-grep 'FAIL: test_bar' tool.sum
-grep 'FAIL: test_baz' tool.sum
+$MAKE check && { cat testsuite/site.exp; exit 1; }
+grep 'PASS: test_foo' testsuite/tool.sum
+grep 'FAIL: test_bar' testsuite/tool.sum
+grep 'FAIL: test_baz' testsuite/tool.sum
-cat >> Makefile.am << 'END'
+cat >> testsuite/Makefile.am << 'END'
EXTRA_DEJAGNU_SITE_CONFIG += bar bar.dir/bar
EXTRA_DIST += bar
DISTCLEANFILES = bar.dir/bar
@@ -92,41 +99,41 @@ bar.dir/bar:
echo 'set baz "/baz/"' > $@
END
-echo 'set bar "/bar/"' > bar
+echo 'set bar "/bar/"' > testsuite/bar
# This will allow us to check one more time that settings in files
# coming later in $(EXTRA_DEJAGNU_SITE_CONFIG) override those in
# files coming earlier.
-echo 'set baz "/xyz/"' >> bar
+echo 'set baz "/xyz/"' >> testsuite/bar
# Ensure that the Makefile will be newer than site.exp, which will
# thus have to be remade.
$sleep
-$AUTOMAKE Makefile
-./config.status Makefile
-
-$MAKE check || { cat site.exp; exit 1; }
-cat site.exp
-cat bar.dir/bar
-$FGREP '/bar/' site.exp
-$FGREP '/baz/' site.exp
-grep 'PASS: test_foo' tool.sum
-grep 'PASS: test_bar' tool.sum
-grep 'PASS: test_baz' tool.sum
+$AUTOMAKE testsuite/Makefile
+./config.status testsuite/Makefile
+
+$MAKE check || { cat testsuite/site.exp; exit 1; }
+cat testsuite/site.exp
+cat testsuite/bar.dir/bar
+$FGREP '/bar/' testsuite/site.exp
+$FGREP '/baz/' testsuite/site.exp
+grep 'PASS: test_foo' testsuite/tool.sum
+grep 'PASS: test_bar' testsuite/tool.sum
+grep 'PASS: test_baz' testsuite/tool.sum
# Check that the features we're testing behave well in VPATH builds.
$MAKE distcheck
# Check that the user can edit the site.exp file, and that his edits
# are retained.
-write_check_for zardoz >> tool.test/tool.exp
-cat tool.test/tool.exp
-echo 'set zardoz "/zardoz/"' >> site.exp
+write_check_for zardoz >> testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
+echo 'set zardoz "/zardoz/"' >> testsuite/site.exp
$MAKE check
-cat site.exp
-grep 'PASS: test_zardoz' tool.sum
+cat testsuite/site.exp
+grep 'PASS: test_zardoz' testsuite/tool.sum
-cat >> Makefile.am << 'END'
+cat >> testsuite/Makefile.am << 'END'
EXTRA_DEJAGNU_SITE_CONFIG += quux.exp
quux.exp:
echo 'set zardoz "/quux/"' > $@
@@ -135,25 +142,25 @@ END
# Ensure that the Makefile will be newer than on site.exp, which will
# thus have to be remade.
$sleep
-$AUTOMAKE Makefile
-./config.status Makefile
-grep 'zardoz.*/quux/' Makefile
+$AUTOMAKE testsuite/Makefile
+./config.status testsuite/Makefile
+grep 'zardoz.*/quux/' testsuite/Makefile
-$MAKE site.exp
-cat site.exp
-cat quux.exp
-grep 'zardoz.*/quux/' site.exp
+(cd testsuite/ && $MAKE site.exp)
+cat testsuite/site.exp
+cat testsuite/quux.exp
+grep 'zardoz.*/quux/' testsuite/site.exp
$MAKE check
-grep 'PASS: test_zardoz' tool.sum
-grep 'zardoz: /zardoz/' tool.log
-grep 'zardoz.*quux' tool.log && exit 1
+grep 'PASS: test_zardoz' testsuite/tool.sum
+grep 'zardoz: /zardoz/' testsuite/tool.log
+grep 'zardoz.*quux' testsuite/tool.log && exit 1
# Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
# by default.
$MAKE distdir
ls -l $distdir
-test ! -e $distdir/bar.dir/bar
-test ! -e $distdir/quux.exp
+test ! -e $distdir/testsuite/bar.dir/bar
+test ! -e $distdir/testsuite/quux.exp
:
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
index 41f15bcd6..f121ec926 100644
--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -20,18 +20,25 @@
. test-init.sh
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = foo
END
# Deliberately select a variable defined automatically by
# the Makefile-generated site.exp.
-mkdir foo.test
-cat > foo.test/foo.exp << 'END'
+mkdir testsuite/foo.test
+cat > testsuite/foo.test/foo.exp << 'END'
send_user "objdir: $objdir\n"
set pipe "|"
if { $objdir == "${pipe}objdir${pipe}" } {
@@ -47,21 +54,21 @@ $AUTOMAKE --add-missing
./configure
-$MAKE site.exp
-echo 'set objdir "|objdir|"' >> site.exp
-cat site.exp
+(cd testsuite/ && $MAKE site.exp)
+echo 'set objdir "|objdir|"' >> testsuite/site.exp
+cat testsuite/site.exp
$sleep
-touch Makefile
-$MAKE site.exp
-cat site.exp
-is_newest site.exp Makefile # Sanity check.
-grep '|objdir|' site.exp
-test $($FGREP -c '|objdir|' site.exp) -eq 1
+touch testsuite/Makefile
+(cd testsuite/ && $MAKE site.exp)
+cat testsuite/site.exp
+is_newest testsuite/site.exp testsuite/Makefile # Sanity check.
+grep '|objdir|' testsuite/site.exp
+test $($FGREP -c '|objdir|' testsuite/site.exp) -eq 1
# We can do a "more semantic" check if DejaGnu is available.
if runtest SOMEPROGRAM=someprogram --version; then
$MAKE check
- grep 'PASS: test_obj' foo.sum
+ grep 'PASS: test_obj' testsuite/foo.sum
fi
:
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
index 8919cec74..40739f874 100644
--- a/t/dejagnu.sh
+++ b/t/dejagnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
index 226da9080..eb1ef550b 100644
--- a/t/dejagnu2.sh
+++ b/t/dejagnu2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
index 406b3eca2..d93c42a26 100644
--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -27,19 +27,27 @@ END
chmod +x hammer
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+EXTRA_DIST = hammer
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = hammer
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer
-EXTRA_DIST = hammer hammer.test/hammer.exp
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer
+EXTRA_DIST = hammer.test/hammer.exp
END
-mkdir hammer.test
+mkdir testsuite/hammer.test
-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
set test test
spawn $HAMMER
expect {
@@ -55,8 +63,8 @@ $AUTOMAKE --add-missing
./configure
$MAKE check
-test -f hammer.log
-test -f hammer.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
$MAKE distcheck
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
index 12bcf799d..7306e9f8d 100644
--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -39,23 +39,31 @@ END
chmod +x spanner
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+EXTRA_DIST = hammer spanner
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = hammer spanner
-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner
-EXTRA_DIST = hammer hammer.test/hammer.exp
-EXTRA_DIST += spanner spanner.test/spanner.exp
+EXTRA_DIST = hammer.test/hammer.exp
+EXTRA_DIST += spanner.test/spanner.exp
END
-mkdir hammer.test spanner.test
+mkdir testsuite/hammer.test testsuite/spanner.test
-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
set test test
spawn $HAMMER
expect {
@@ -64,7 +72,7 @@ expect {
}
END
-cat > spanner.test/spanner.exp << 'END'
+cat > testsuite/spanner.test/spanner.exp << 'END'
set test test
spawn $SPANNER
expect {
@@ -80,10 +88,10 @@ $AUTOMAKE --add-missing
./configure
$MAKE check
-test -f hammer.log
-test -f hammer.sum
-test -f spanner.log
-test -f spanner.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
+test -f testsuite/spanner.log
+test -f testsuite/spanner.sum
$MAKE distcheck
@@ -92,11 +100,12 @@ sed 's/E\(verything\)/Not e\1/' hammer > thammer
mv -f thammer hammer
chmod +x hammer
-rm -f hammer.log hammer.sum spanner.log spanner.sum
+rm -f testsuite/hammer.log testsuite/hammer.sum
+rm -f testsuite/spanner.log testsuite/spanner.sum
$MAKE check && exit 1
-test -f hammer.log
-test -f hammer.sum
-test -f spanner.log
-test -f spanner.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
+test -f testsuite/spanner.log
+test -f testsuite/spanner.sum
:
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
index 90bd946aa..63f11afd8 100644
--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -29,17 +29,25 @@ END
chmod +x $package
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << END
+SUBDIRS = testsuite
+EXTRA_DIST = $package
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << END
AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $package $package.test/$package.exp
-AM_RUNTESTFLAGS = PACKAGE=\$(srcdir)/$package
+EXTRA_DIST = $package.test/$package.exp
+AM_RUNTESTFLAGS = PACKAGE=\$(top_srcdir)/$package
END
-mkdir $package.test
-cat > $package.test/$package.exp << 'END'
+mkdir testsuite/$package.test
+cat > testsuite/$package.test/$package.exp << 'END'
set test "a_dejagnu_test"
spawn $PACKAGE
expect {
@@ -55,8 +63,8 @@ $AUTOMAKE --add-missing
./configure
$MAKE check
-test -f $package.log
-test -f $package.sum
+test -f testsuite/$package.log
+test -f testsuite/$package.sum
$MAKE distcheck
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
index 2e6d7ac0a..95054ed78 100644
--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -26,17 +26,24 @@ END
chmod +x faildeja
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = faildeja
-AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja
+AM_RUNTESTFLAGS = FAILDEJA=$(top_srcdir)/faildeja
END
-mkdir faildeja.test
-cat > faildeja.test/faildeja.exp << 'END'
+mkdir testsuite/faildeja.test
+cat > testsuite/faildeja.test/faildeja.exp << 'END'
set test failing_deja_test
spawn $FAILDEJA
expect {
@@ -51,8 +58,8 @@ $AUTOMAKE --add-missing
./configure
$MAKE check && exit 1
-test -f faildeja.log
-test -f faildeja.sum
-$FGREP 'FAIL: failing_deja_test' faildeja.sum
+test -f testsuite/faildeja.log
+test -f testsuite/faildeja.sum
+$FGREP 'FAIL: failing_deja_test' testsuite/faildeja.sum
:
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
index 390623763..b57341e50 100644
--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -30,17 +30,24 @@ END
chmod +x failtcl
cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = failtcl
-AM_RUNTESTFLAGS = --status FAILTCL=$(srcdir)/failtcl
+AM_RUNTESTFLAGS = --status FAILTCL=$(top_srcdir)/failtcl
END
-mkdir failtcl.test
-cat > failtcl.test/failtcl.exp << 'END'
+mkdir testsuite/failtcl.test
+cat > testsuite/failtcl.test/failtcl.exp << 'END'
set test test
spawn $FAILTCL
expect {
@@ -55,8 +62,8 @@ $AUTOMAKE --add-missing
./configure
$MAKE check && exit 1
-test -f failtcl.log
-test -f failtcl.sum
-$FGREP 'missing close-brace' failtcl.sum
+test -f testsuite/failtcl.log
+test -f testsuite/failtcl.sum
+$FGREP 'missing close-brace' testsuite/failtcl.sum
:
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
index dc5f2fc55..406c3961d 100644
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
index 6ea72cded..472c33508 100644
--- a/t/deleted-m4.sh
+++ b/t/deleted-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/depacl2.sh b/t/depacl2.sh
index 654136758..d9760ad74 100644
--- a/t/depacl2.sh
+++ b/t/depacl2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
index 446cbddee..507fc6b22 100644
--- a/t/depcomp-implicit-auxdir.sh
+++ b/t/depcomp-implicit-auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/depcomp.sh b/t/depcomp.sh
index c75f02ea4..487f340e9 100644
--- a/t/depcomp.sh
+++ b/t/depcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 6bb3076c5..4787b2228 100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 1908f7b17..6dabb8424 100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index ba645b46e..a1cb16755 100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/depdist.sh b/t/depdist.sh
index 99cf706b7..9fe0afa69 100644
--- a/t/depdist.sh
+++ b/t/depdist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/depend-postproc.sh b/t/depend-postproc.sh
index ec0784080..7fa9e3bab 100644
--- a/t/depend-postproc.sh
+++ b/t/depend-postproc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/depend.sh b/t/depend.sh
index b44a94dc2..322a45b6b 100644
--- a/t/depend.sh
+++ b/t/depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/depend3.sh b/t/depend3.sh
index 0b6c55a18..65937c280 100644
--- a/t/depend3.sh
+++ b/t/depend3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/depend4.sh b/t/depend4.sh
index 7cd97d773..740033694 100644
--- a/t/depend4.sh
+++ b/t/depend4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/depend5.sh b/t/depend5.sh
index 3bc14405a..3ae0e60f5 100644
--- a/t/depend5.sh
+++ b/t/depend5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/depend6.sh b/t/depend6.sh
index 7e255486b..c2a5f6408 100644
--- a/t/depend6.sh
+++ b/t/depend6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 21614bafa..9f8eaa9ce 100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -35,6 +35,7 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
$ac_init
$am_init_automake
AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
END
cat configure.ac # For debugging.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
diff --git a/t/destdir.sh b/t/destdir.sh
index 5c6d98ff3..ac2896342 100644
--- a/t/destdir.sh
+++ b/t/destdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/dir-named-obj-is-bad.sh b/t/dir-named-obj-is-bad.sh
index fb8ecc903..78d5d3224 100644
--- a/t/dir-named-obj-is-bad.sh
+++ b/t/dir-named-obj-is-bad.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/discover.sh b/t/discover.sh
index 65441742e..6b271525a 100644
--- a/t/discover.sh
+++ b/t/discover.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index f6822b082..cfbb223e8 100644
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
index 27a19677f..d3bb1cf4f 100644
--- a/t/dist-auxfile-2.sh
+++ b/t/dist-auxfile-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index 398b7505e..aacbde45e 100644
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index f4e23aec0..cbb2522a9 100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
index 5ca68ef41..1134863c6 100644
--- a/t/dist-included-parent-dir.sh
+++ b/t/dist-included-parent-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/dist-install-sh.sh b/t/dist-install-sh.sh
index 9a720bb9b..a9116b4e5 100644
--- a/t/dist-install-sh.sh
+++ b/t/dist-install-sh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/dist-lzma.sh b/t/dist-lzma.sh
index 7a39602b3..57c8e65dd 100644
--- a/t/dist-lzma.sh
+++ b/t/dist-lzma.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
index c505d2d27..f9d7d84b2 100644
--- a/t/dist-missing-am.sh
+++ b/t/dist-missing-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
index b4f4c5878..24cf49207 100644
--- a/t/dist-missing-included-m4.sh
+++ b/t/dist-missing-included-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index 8fb4295c4..caadc2b75 100644
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-no-built-sources.sh b/t/dist-no-built-sources.sh
new file mode 100644
index 000000000..622e48f0e
--- /dev/null
+++ b/t/dist-no-built-sources.sh
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2021 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+# Test the presence and absence of the option no-dist-built-sources.
+
+. test-init.sh
+
+# the tests are almost the same, so do a loop with a couple conditionals.
+for testopt in no-built-sources dist-built-sources; do
+
+ if test "$testopt" = no-built-sources; then
+ sed -e 's/AM_INIT_AUTOMAKE/AM_INIT_AUTOMAKE([no-dist-built-sources])/' \
+ configure.ac >configure.tmp
+ cmp configure.ac configure.tmp && fatal_ 'failed to edit configure.ac'
+ mv -f configure.tmp configure.ac
+ fi
+
+ cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+ cat > Makefile.am <<EOF
+BUILT_SOURCES = x.c
+EXTRA_DIST = y.c
+
+x.c:
+ touch \$@
+
+y.c:
+ cp x.c y.c # simulate 'undetectable' dependency on x.c
+EOF
+
+ if test "$testopt" = no-built-sources; then
+ touch y.c # no-built-sources dist needs to have all files already there
+ else
+ : # with default $(BUILT_SOURCES) dep, will try to build y.c by the rule
+ fi
+
+ $ACLOCAL
+ $AUTOMAKE
+ $AUTOCONF
+ ./configure
+ run_make dist
+
+ # In any case, the tarball should contain y.c, but not x.c.
+ # The tarball is always named based on $0, regardless of our options.
+ pkg_ver=$me-1.0
+ ! tar tf "${pkg_ver}".tar.gz "${pkg_ver}"/x.c
+ tar tf "${pkg_ver}".tar.gz "${pkg_ver}"/y.c
+
+ # And x.c should have been built only for the built-sources version.
+ if test "$testopt" = no-built-sources; then
+ # no-built-sources should not have generated this
+ ! test -e x.c
+ else
+ # built-sources build should have it
+ test -e x.c
+ fi
+done
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
index e997e936c..df04feb3b 100644
--- a/t/dist-pr109765.sh
+++ b/t/dist-pr109765.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index ab78e6ba4..29ab4c570 100644
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
index 1ba82bf10..2ad470993 100644
--- a/t/dist-repeated.sh
+++ b/t/dist-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dist-shar.sh b/t/dist-shar.sh
index 37e8bec6d..ebafa7b37 100644
--- a/t/dist-shar.sh
+++ b/t/dist-shar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/dist-tarZ.sh b/t/dist-tarZ.sh
index eb835534e..c54cd3281 100644
--- a/t/dist-tarZ.sh
+++ b/t/dist-tarZ.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/dist-vs-built-sources.sh b/t/dist-vs-built-sources.sh
index d1bf95fef..5bc2c6056 100644
--- a/t/dist-vs-built-sources.sh
+++ b/t/dist-vs-built-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2017-2020 Free Software Foundation, Inc.
+# Copyright (C) 2017-2021 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
diff --git a/t/dist-with-unreadable-makefile-fails.sh b/t/dist-with-unreadable-makefile-fails.sh
index 4666a14d7..15d11de40 100644
--- a/t/dist-with-unreadable-makefile-fails.sh
+++ b/t/dist-with-unreadable-makefile-fails.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/distcheck-configure-flags-am.sh b/t/distcheck-configure-flags-am.sh
index bbb899b46..5980f62ed 100644
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-configure-flags-subpkg.sh b/t/distcheck-configure-flags-subpkg.sh
index 1b42aa472..328d71efd 100644
--- a/t/distcheck-configure-flags-subpkg.sh
+++ b/t/distcheck-configure-flags-subpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index 8dfce08e6..5a210a1b9 100644
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index bd9914777..896efd991 100644
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index 4a824498b..75478cc35 100644
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index 17eed15c8..e7e666b74 100644
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-no-prefix-or-srcdir-override.sh b/t/distcheck-no-prefix-or-srcdir-override.sh
index 9f222ca84..b2e5d43a3 100644
--- a/t/distcheck-no-prefix-or-srcdir-override.sh
+++ b/t/distcheck-no-prefix-or-srcdir-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index 0ef36bccf..b250995ac 100644
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-override-dvi.sh b/t/distcheck-override-dvi.sh
index 8d83d7e18..b1cefc655 100644
--- a/t/distcheck-override-dvi.sh
+++ b/t/distcheck-override-dvi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index 1535bedcb..851dbbff7 100644
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index 690a18532..f01e4b9c5 100644
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/distcheck-pr18286.sh b/t/distcheck-pr18286.sh
index b6c396e42..ee5e86408 100644
--- a/t/distcheck-pr18286.sh
+++ b/t/distcheck-pr18286.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2021 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
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
index 480104cd3..a970186f7 100644
--- a/t/distcheck-pr9579.sh
+++ b/t/distcheck-pr9579.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
index 232e387d7..d527ac4a7 100644
--- a/t/distcheck-writable-srcdir.sh
+++ b/t/distcheck-writable-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
index 94210667f..4880b6b6d 100644
--- a/t/distcleancheck.sh
+++ b/t/distcleancheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index ae13ada2f..05d91345e 100644
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/distcom2.sh b/t/distcom2.sh
index 9940c91f7..9ec5faf5f 100644
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/distcom3.sh b/t/distcom3.sh
index cab56effb..72b34a326 100644
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/distcom4.sh b/t/distcom4.sh
index fa0fbd1f3..84af20dd5 100644
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/distcom5.sh b/t/distcom5.sh
index 96655c669..f044a1c35 100644
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/distdir.sh b/t/distdir.sh
index f28ff086f..0b57a0b04 100644
--- a/t/distdir.sh
+++ b/t/distdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/disthook.sh b/t/disthook.sh
index bdee4829a..616043fe5 100644
--- a/t/disthook.sh
+++ b/t/disthook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/distlinks.sh b/t/distlinks.sh
index b0f303cff..c230e5006 100644
--- a/t/distlinks.sh
+++ b/t/distlinks.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
index d6218c28c..d86f7b5ea 100644
--- a/t/distlinksbrk.sh
+++ b/t/distlinksbrk.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/distname.sh b/t/distname.sh
index 9e3c1e34b..230e7bfa8 100644
--- a/t/distname.sh
+++ b/t/distname.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
index ab2af0268..f1ab47778 100644
--- a/t/dmalloc.sh
+++ b/t/dmalloc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/doc-parsing-buglets-colneq-subst.sh b/t/doc-parsing-buglets-colneq-subst.sh
index 6cbaa0f11..2d757d0e5 100644
--- a/t/doc-parsing-buglets-colneq-subst.sh
+++ b/t/doc-parsing-buglets-colneq-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh
index 1ba22db80..f79278c8c 100644
--- a/t/doc-parsing-buglets-tabs.sh
+++ b/t/doc-parsing-buglets-tabs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/dollar.sh b/t/dollar.sh
index 958383dd1..963a61b22 100644
--- a/t/dollar.sh
+++ b/t/dollar.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/dollarvar.sh b/t/dollarvar.sh
index 93c4ef3f0..ff26d70ac 100644
--- a/t/dollarvar.sh
+++ b/t/dollarvar.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
index f0d3c876b..f347c5f1c 100644
--- a/t/dollarvar2.sh
+++ b/t/dollarvar2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/double.sh b/t/double.sh
index 738a6f7f8..a9047a985 100644
--- a/t/double.sh
+++ b/t/double.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/dup2.sh b/t/dup2.sh
index 58abe7075..34bafa561 100644
--- a/t/dup2.sh
+++ b/t/dup2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/else.sh b/t/else.sh
index 56a2cd6da..210530404 100644
--- a/t/else.sh
+++ b/t/else.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
index 87cf3e19a..96a375dbb 100644
--- a/t/empty-data-primary.sh
+++ b/t/empty-data-primary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
index d55b5998a..e21a2b90e 100644
--- a/t/empty-sources-primary.tap
+++ b/t/empty-sources-primary.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/exdir.sh b/t/exdir.sh
index 34f57d970..63d4bb576 100644
--- a/t/exdir.sh
+++ b/t/exdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/exdir2.sh b/t/exdir2.sh
index 5fd439b76..c611bca1e 100644
--- a/t/exdir2.sh
+++ b/t/exdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/exdir3.sh b/t/exdir3.sh
index 46355ca7f..96bf82638 100644
--- a/t/exdir3.sh
+++ b/t/exdir3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/exeext.sh b/t/exeext.sh
index 9719068da..8314f07c3 100644
--- a/t/exeext.sh
+++ b/t/exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/exeext2.sh b/t/exeext2.sh
index 947058817..4d4e7c173 100644
--- a/t/exeext2.sh
+++ b/t/exeext2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/exeext3.sh b/t/exeext3.sh
index 6684a5f72..fe231b3b3 100644
--- a/t/exeext3.sh
+++ b/t/exeext3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/exeext4.sh b/t/exeext4.sh
index ae82eb51e..ea39c7975 100644
--- a/t/exeext4.sh
+++ b/t/exeext4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/ext.sh b/t/ext.sh
index 9d8c99ec6..e09ec12cc 100644
--- a/t/ext.sh
+++ b/t/ext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/ext2.sh b/t/ext2.sh
index 86759e087..968e23132 100644
--- a/t/ext2.sh
+++ b/t/ext2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/ext3.sh b/t/ext3.sh
index 916ef1977..9f5d70409 100644
--- a/t/ext3.sh
+++ b/t/ext3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/extra-data.sh b/t/extra-data.sh
index b1e14a169..449c73f73 100644
--- a/t/extra-data.sh
+++ b/t/extra-data.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/extra-deps-lt.sh b/t/extra-deps-lt.sh
index 019c48868..b62f961ad 100644
--- a/t/extra-deps-lt.sh
+++ b/t/extra-deps-lt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/extra-deps.sh b/t/extra-deps.sh
index de78d2610..70e741626 100644
--- a/t/extra-deps.sh
+++ b/t/extra-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/extra-dist-dirs-and-subdirs.sh b/t/extra-dist-dirs-and-subdirs.sh
index 388737e34..dd6b430e0 100644
--- a/t/extra-dist-dirs-and-subdirs.sh
+++ b/t/extra-dist-dirs-and-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/extra-dist-vpath-dir-merge.sh b/t/extra-dist-vpath-dir-merge.sh
index c6b18b2f0..5dffbdad2 100644
--- a/t/extra-dist-vpath-dir-merge.sh
+++ b/t/extra-dist-vpath-dir-merge.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/extra-dist-vpath-dir.sh b/t/extra-dist-vpath-dir.sh
index 30bd01612..76b672055 100644
--- a/t/extra-dist-vpath-dir.sh
+++ b/t/extra-dist-vpath-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/extra-dist-wildcards-gnu.sh b/t/extra-dist-wildcards-gnu.sh
index af5468de5..830fa97c7 100644
--- a/t/extra-dist-wildcards-gnu.sh
+++ b/t/extra-dist-wildcards-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
index c6a18189a..24a1c0f34 100644
--- a/t/extra-dist-wildcards-vpath.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
index c525d69a3..6992b9914 100644
--- a/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index cfeaaf626..1e4ee7169 100644
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
index e50d468b1..1f64e830e 100644
--- a/t/extra-portability2.sh
+++ b/t/extra-portability2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/extra-portability3.sh b/t/extra-portability3.sh
index 64c4689e3..cd1f42ee7 100644
--- a/t/extra-portability3.sh
+++ b/t/extra-portability3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/extra-programs-and-libs.sh b/t/extra-programs-and-libs.sh
index 15f87b5d3..4a530608b 100644
--- a/t/extra-programs-and-libs.sh
+++ b/t/extra-programs-and-libs.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
index 95601bf6d..39804249c 100644
--- a/t/extra-programs-empty.sh
+++ b/t/extra-programs-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/extra-programs-misc.sh b/t/extra-programs-misc.sh
index f572b722c..952582674 100644
--- a/t/extra-programs-misc.sh
+++ b/t/extra-programs-misc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/extra-sources-no-spurious.sh b/t/extra-sources-no-spurious.sh
index dfd3f0209..df3608c7b 100644
--- a/t/extra-sources-no-spurious.sh
+++ b/t/extra-sources-no-spurious.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/extra-sources.sh b/t/extra-sources.sh
index 50839ef55..1bc619885 100644
--- a/t/extra-sources.sh
+++ b/t/extra-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/extra.sh b/t/extra.sh
index 6cb6a46b9..c7b391df1 100644
--- a/t/extra.sh
+++ b/t/extra.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/f90only.sh b/t/f90only.sh
index eeeb1bc24..7595ed385 100644
--- a/t/f90only.sh
+++ b/t/f90only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/flavor.sh b/t/flavor.sh
index e4aa6eece..105bcb9d9 100644
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/flibs.sh b/t/flibs.sh
index 3abc22221..c9cd65f4d 100644
--- a/t/flibs.sh
+++ b/t/flibs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/fn99.sh b/t/fn99.sh
index 723e973bc..4eceff3c8 100644
--- a/t/fn99.sh
+++ b/t/fn99.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
index 280d675ff..cf4f29f80 100644
--- a/t/fn99subdir.sh
+++ b/t/fn99subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/fnoc.sh b/t/fnoc.sh
index 6c0395b44..f380c9be8 100644
--- a/t/fnoc.sh
+++ b/t/fnoc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/fonly.sh b/t/fonly.sh
index 7e506a67a..9cbfb91d3 100644
--- a/t/fonly.sh
+++ b/t/fonly.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
index 15d733651..7674e143b 100644
--- a/t/forcemiss.sh
+++ b/t/forcemiss.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
index 32d16ad71..0f820e003 100644
--- a/t/forcemiss2.sh
+++ b/t/forcemiss2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/fort1.sh b/t/fort1.sh
index 5f17d77fc..b53c714e1 100644
--- a/t/fort1.sh
+++ b/t/fort1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/fort2.sh b/t/fort2.sh
index 2498c382a..cbd50e112 100644
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/fort4.sh b/t/fort4.sh
index 7309002ab..7a87a41ba 100644
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/fort5.sh b/t/fort5.sh
index 4e6b3936b..2c3ac3fb0 100644
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/fortdep.sh b/t/fortdep.sh
index 89b22749f..879416c40 100644
--- a/t/fortdep.sh
+++ b/t/fortdep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/gcj.sh b/t/gcj.sh
index 4f66bb6df..c6e002837 100644
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/gcj2.sh b/t/gcj2.sh
index cf98aec73..2fcdff80b 100644
--- a/t/gcj2.sh
+++ b/t/gcj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/gcj3.sh b/t/gcj3.sh
index 4e4699c9f..0305c7152 100644
--- a/t/gcj3.sh
+++ b/t/gcj3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/gcj4.sh b/t/gcj4.sh
index 09149487b..8739ea6a7 100644
--- a/t/gcj4.sh
+++ b/t/gcj4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gcj5.sh b/t/gcj5.sh
index 7232b90f5..1b04df210 100644
--- a/t/gcj5.sh
+++ b/t/gcj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gcj6.sh b/t/gcj6.sh
index e268f1c9e..e8a097298 100644
--- a/t/gcj6.sh
+++ b/t/gcj6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index 9f41ec484..8d57cc3f0 100644
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/gettext-basics.sh b/t/gettext-basics.sh
index 5e07d94f5..78e61438f 100644
--- a/t/gettext-basics.sh
+++ b/t/gettext-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh
index 6af9e039a..403ec5483 100644
--- a/t/gettext-config-rpath.sh
+++ b/t/gettext-config-rpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gettext-external-pr338.sh b/t/gettext-external-pr338.sh
index c798431a3..a4e2a2705 100644
--- a/t/gettext-external-pr338.sh
+++ b/t/gettext-external-pr338.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gettext-intl-subdir.sh b/t/gettext-intl-subdir.sh
index 44545de1b..a86118560 100644
--- a/t/gettext-intl-subdir.sh
+++ b/t/gettext-intl-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 2f7a11566..aa0b93110 100644
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/gettext-pr381.sh b/t/gettext-pr381.sh
index 863bd65f8..bc7760eb3 100644
--- a/t/gettext-pr381.sh
+++ b/t/gettext-pr381.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gnits.sh b/t/gnits.sh
index eec778853..3ce6d6853 100644
--- a/t/gnits.sh
+++ b/t/gnits.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/gnits2.sh b/t/gnits2.sh
index 66f549f82..ef09e006f 100644
--- a/t/gnits2.sh
+++ b/t/gnits2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gnits3.sh b/t/gnits3.sh
index a38e67d05..21754984f 100644
--- a/t/gnits3.sh
+++ b/t/gnits3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gnumake.sh b/t/gnumake.sh
index 8e413ef61..4bd150bda 100644
--- a/t/gnumake.sh
+++ b/t/gnumake.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
index 3d3fc1547..614c2d731 100644
--- a/t/gnuwarn.sh
+++ b/t/gnuwarn.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
index 118f01e9e..bd0a549bf 100644
--- a/t/gnuwarn2.sh
+++ b/t/gnuwarn2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index b15d80943..1c93528df 100644
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/header.sh b/t/header.sh
index 287dc26aa..b4426cb3d 100644
--- a/t/header.sh
+++ b/t/header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/help-depend.sh b/t/help-depend.sh
index 8fd808c9f..b41e28f61 100644
--- a/t/help-depend.sh
+++ b/t/help-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
index 9ac4950a6..e13bca6d4 100644
--- a/t/help-depend2.sh
+++ b/t/help-depend2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
index e7bffdba1..98d745f8b 100644
--- a/t/help-dmalloc.sh
+++ b/t/help-dmalloc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-init.sh b/t/help-init.sh
index b954f2e64..86d0d9ed7 100644
--- a/t/help-init.sh
+++ b/t/help-init.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
index a2bc47bf1..1cbffcf78 100644
--- a/t/help-lispdir.sh
+++ b/t/help-lispdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-python.sh b/t/help-python.sh
index fe560c8e3..a9d73c419 100644
--- a/t/help-python.sh
+++ b/t/help-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/help-silent.sh b/t/help-silent.sh
index df18926db..2250f0a15 100644
--- a/t/help-silent.sh
+++ b/t/help-silent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help-upc.sh b/t/help-upc.sh
index 50314086b..472761a87 100644
--- a/t/help-upc.sh
+++ b/t/help-upc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help.sh b/t/help.sh
index 9e76962f5..56b47cb31 100644
--- a/t/help.sh
+++ b/t/help.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/help2.sh b/t/help2.sh
index aa9194db9..b28f695a0 100644
--- a/t/help2.sh
+++ b/t/help2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help3.sh b/t/help3.sh
index 62274f65d..6ebdeaac5 100644
--- a/t/help3.sh
+++ b/t/help3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/help4.sh b/t/help4.sh
index 8168d24c8..3c0f7ae41 100644
--- a/t/help4.sh
+++ b/t/help4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/hfs.sh b/t/hfs.sh
index 298d1c783..531e42471 100644
--- a/t/hfs.sh
+++ b/t/hfs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/implicit.sh b/t/implicit.sh
index 1ceaced0f..4188c61aa 100644
--- a/t/implicit.sh
+++ b/t/implicit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/init.sh b/t/init.sh
index c6f6d6461..0622622f8 100644
--- a/t/init.sh
+++ b/t/init.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
@@ -25,6 +25,7 @@ for ac_init_args in '' '([x])'; do
unindent >configure.ac <<END
AC_INIT$ac_init_args
AM_INIT_AUTOMAKE$am_init_args
+ AC_OUTPUT
END
cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
diff --git a/t/init2.sh b/t/init2.sh
index 08c4de295..edd269839 100644
--- a/t/init2.sh
+++ b/t/init2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index 8d9a9ff32..e80f06442 100644
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/install-sh-option-C.sh b/t/install-sh-option-C.sh
index afa41bce2..386927f90 100644
--- a/t/install-sh-option-C.sh
+++ b/t/install-sh-option-C.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/install-sh-option-S.sh b/t/install-sh-option-S.sh
index 991741bf6..b34453103 100644
--- a/t/install-sh-option-S.sh
+++ b/t/install-sh-option-S.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/install-sh-unittests.sh b/t/install-sh-unittests.sh
index 7c0c9c370..481de5b65 100644
--- a/t/install-sh-unittests.sh
+++ b/t/install-sh-unittests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/installdir.sh b/t/installdir.sh
index 1cbc71023..c77428e95 100644
--- a/t/installdir.sh
+++ b/t/installdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/instdat.sh b/t/instdat.sh
index c2d4b3550..ce36a9b99 100644
--- a/t/instdat.sh
+++ b/t/instdat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/instdat2.sh b/t/instdat2.sh
index 259c932c2..562b184ca 100644
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
index 28945e972..6da943a63 100644
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
index d3fc302ef..c14182f6a 100644
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
index 3d0119734..1f98b1d43 100644
--- a/t/instdir-java.sh
+++ b/t/instdir-java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
index ee8d3c58c..69a632a45 100644
--- a/t/instdir-lisp.sh
+++ b/t/instdir-lisp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index e3e36d694..ad54c9fa8 100644
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index 3d31c664e..af66b9cb9 100644
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 0878f7be5..95cd08b77 100644
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
index ee65e541d..a301e182d 100644
--- a/t/instdir-python.sh
+++ b/t/instdir-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index ad7bddd25..03f9e7e23 100644
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir.sh b/t/instdir.sh
index 69432b198..ad0dd0269 100644
--- a/t/instdir.sh
+++ b/t/instdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instdir2.sh b/t/instdir2.sh
index 87544685e..42532ce26 100644
--- a/t/instdir2.sh
+++ b/t/instdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/instexec.sh b/t/instexec.sh
index 1055b2a6e..a56e10d1e 100644
--- a/t/instexec.sh
+++ b/t/instexec.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
index 1a049e8f6..84bac71d9 100644
--- a/t/instfail-info.sh
+++ b/t/instfail-info.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
index 3007a8efe..194e7f87e 100644
--- a/t/instfail-java.sh
+++ b/t/instfail-java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
index 0bb552a63..a4684d78d 100644
--- a/t/instfail-libtool.sh
+++ b/t/instfail-libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/instfail.sh b/t/instfail.sh
index 8b4eb915a..7f26e24a4 100644
--- a/t/instfail.sh
+++ b/t/instfail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/insthook.sh b/t/insthook.sh
index 26dfe1130..4d172f85b 100644
--- a/t/insthook.sh
+++ b/t/insthook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/instman.sh b/t/instman.sh
index 2653fafb2..9f247b227 100644
--- a/t/instman.sh
+++ b/t/instman.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/instman2.sh b/t/instman2.sh
index a554d989e..9ff56ac61 100644
--- a/t/instman2.sh
+++ b/t/instman2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
index 5c7fb2e0a..13169cf3a 100644
--- a/t/instmany-mans.sh
+++ b/t/instmany-mans.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index dce3594b5..ed32d307f 100644
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
@@ -119,18 +119,18 @@ cd build
test -n "$orig_INSTALL"
$MAKE
# Try whether native install (or install-sh) works.
-$MAKE install
+run_make install PYTHON_PREFIX="$instdir"
test -n "$(find "$instdir" -name python1.py)"
# Multiple uninstall should work, too.
-$MAKE uninstall
-$MAKE uninstall
+run_make uninstall PYTHON_PREFIX="$instdir"
+run_make uninstall PYTHON_PREFIX="$instdir"
test $(find "$instdir" -type f -print | wc -l) -eq 0
# Try whether we don't exceed the low limit.
PATH=$nPATH; export PATH
-run_make INSTALL=my-install install
+run_make INSTALL=my-install PYTHON_PREFIX="$instdir" install
test -n "$(find "$instdir" -name python1.py)"
-run_make INSTALL=my-install uninstall
+run_make INSTALL=my-install PYTHON_PREFIX="$instdir" uninstall
test $(find "$instdir" -type f -print | wc -l) -eq 0
PATH=$oPATH; export PATH
@@ -143,14 +143,14 @@ for file in python3.py python$nfiles.py
do
chmod a-r $srcdir/$file
test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
- $MAKE install && exit 1
+ run_make install PYTHON_PREFIX="$instdir" && exit 1
chmod u+r $srcdir/$file
done
for file in npython3.py npython$nfiles.py
do
chmod a-r $srcdir/$file
- $MAKE install && exit 1
+ run_make install PYTHON_PREFIX="$instdir" && exit 1
chmod u+r $srcdir/$file
done
diff --git a/t/instmany.sh b/t/instmany.sh
index dfab2fb98..d443a6c50 100644
--- a/t/instmany.sh
+++ b/t/instmany.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/instspc.tap b/t/instspc.tap
index f5f23d579..0f94c4f93 100644
--- a/t/instspc.tap
+++ b/t/instspc.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/interp.sh b/t/interp.sh
index 215644dc4..8e6db2107 100644
--- a/t/interp.sh
+++ b/t/interp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/interp2.sh b/t/interp2.sh
index 733329823..71932f2e4 100644
--- a/t/interp2.sh
+++ b/t/interp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/java-check.sh b/t/java-check.sh
index cb8b99876..c678784b6 100644
--- a/t/java-check.sh
+++ b/t/java-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-clean.sh b/t/java-clean.sh
index 52d6117af..838ba9610 100644
--- a/t/java-clean.sh
+++ b/t/java-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
index 8cbfd58d7..1da4be981 100644
--- a/t/java-compile-install.sh
+++ b/t/java-compile-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -78,6 +78,11 @@ installcheck-local: test-install
.PHONY: test test-install
DISTCLEANFILES = Baz.java Foo2.java
+
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# /usr/bin/install: cannot create regular file '/u/karl/gnu/src/akarl/t/java-compile-install.dir/_inst/share/java/Baz.class': File exists
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
echo 'class aClass {}' > Foo.java
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index a9a69cf0a..379c51a4a 100644
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -175,6 +175,14 @@ TESTS = \
XFAIL_TESTS = badarg.test
EXTRA_DIST += $(TESTS)
+
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# /usr/bin/install: cannot change permissions of '/tmp/am-dc-13378//u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_inst/share/java-compile-run-flat/java/HelloStream.class': No such file or directory
+# /usr/bin/install: cannot create regular file '/tmp/am-dc-13378//u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_inst/share/java-compile-run-flat/java/PkgLocation.class': File exists
+# make[2]: *** [Makefile:393: install-dist_javaJAVA] Error 1
+# make[2]: Leaving directory '/u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_build/sub'
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
cat > simple.test <<'END'
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
index b52729175..30f8f74c9 100644
--- a/t/java-compile-run-nested.sh
+++ b/t/java-compile-run-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -70,6 +70,10 @@ check-local: test-built
installcheck-local: test-installed run-installed
.PHONY: test-built test-installed run-installed
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
## WRAPPER SCRIPT ##
@@ -92,6 +96,10 @@ jprog: jprog.sh
EXTRA_DIST = jprog.sh
CLEANFILES = jprog
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
cat > bin/jprog.sh <<'END'
@@ -111,6 +119,12 @@ mkdir jprog
cat > jprog/Makefile.am <<'END'
dist_jprogclass_JAVA = Main.java HelloStream.java
nodist_jprogclass_JAVA = PkgLocation.java
+
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# /p/bin/install: cannot create regular file '/w/co/automake/t/java-compile-run-nested.dir/_inst/share/java-compile-run-nested/jprog/HelloStream.class':
+# File exists
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
cat > jprog/PkgLocation.jin <<'END'
@@ -184,6 +198,10 @@ TESTS = \
XFAIL_TESTS = badarg.test
EXTRA_DIST = $(TESTS)
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
cat > tests/simple.test <<'END'
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
index aa3fd5b91..eb43fb9a3 100644
--- a/t/java-empty-classpath.sh
+++ b/t/java-empty-classpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-extra.sh b/t/java-extra.sh
index 34388d7e1..c6bc7c099 100644
--- a/t/java-extra.sh
+++ b/t/java-extra.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-mix.sh b/t/java-mix.sh
index 77230ae05..2bbccbddf 100644
--- a/t/java-mix.sh
+++ b/t/java-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
index 83ee75fa8..a9a4a196e 100644
--- a/t/java-no-duplicate.sh
+++ b/t/java-no-duplicate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
index 7f1ba90d0..2a0c2ee37 100644
--- a/t/java-nobase.sh
+++ b/t/java-nobase.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
index 51f478900..7cbed595d 100644
--- a/t/java-noinst.sh
+++ b/t/java-noinst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
index 36b4f18b0..9506a1c4d 100644
--- a/t/java-rebuild.sh
+++ b/t/java-rebuild.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-sources.sh b/t/java-sources.sh
index 2d1ce8726..24b5a1af3 100644
--- a/t/java-sources.sh
+++ b/t/java-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
index 8c546209d..dab62909f 100644
--- a/t/java-uninstall.sh
+++ b/t/java-uninstall.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
@@ -47,6 +47,11 @@ Baz.java:
chmod a-w $@-t && mv -f $@-t $@
DISTCLEANFILES = Baz.java Foo2.java
+
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# /usr/bin/install: cannot create regular file '/u/karl/gnu/src/akarl/t/java-uninstall.dir/java-uninstall-1.0/_inst/java/Baz.class': File exists
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
echo 'class aClass {}' > Foo.java
diff --git a/t/java.sh b/t/java.sh
index d941f9c08..d22e4c499 100644
--- a/t/java.sh
+++ b/t/java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/java2.sh b/t/java2.sh
index 56dae3962..311ff9c2c 100644
--- a/t/java2.sh
+++ b/t/java2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/java3.sh b/t/java3.sh
index 96b3a4d42..9b71eeb3a 100644
--- a/t/java3.sh
+++ b/t/java3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
index b34a701b1..71e55901c 100644
--- a/t/javadir-undefined.sh
+++ b/t/javadir-undefined.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/javaflags.sh b/t/javaflags.sh
index 09911deb3..2648f5e1a 100644
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/javaprim.sh b/t/javaprim.sh
index 8a2b94a97..86d6ee2df 100644
--- a/t/javaprim.sh
+++ b/t/javaprim.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/javasubst.sh b/t/javasubst.sh
index 0e4dec90a..505d65f91 100644
--- a/t/javasubst.sh
+++ b/t/javasubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/ldadd.sh b/t/ldadd.sh
index f269d8e05..4a8612919 100644
--- a/t/ldadd.sh
+++ b/t/ldadd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/ldflags.sh b/t/ldflags.sh
index b6cda5afe..901ac85ac 100644
--- a/t/ldflags.sh
+++ b/t/ldflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index b2c1f0477..2bd592cbc 100644
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 14abb7518..ff87eede5 100644
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index 99b7346c5..9e1ba3cc1 100644
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index e8f4f8959..0d4360c53 100644
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 0c150e397..2e5b27bc0 100644
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-header.sh b/t/lex-header.sh
index f498fff3b..92e465dd1 100644
--- a/t/lex-header.sh
+++ b/t/lex-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
index 2fecef7c9..5c51a9bfb 100644
--- a/t/lex-lib-external.sh
+++ b/t/lex-lib-external.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
index 2eb900665..5bf8ae330 100644
--- a/t/lex-lib.sh
+++ b/t/lex-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index b9d22b632..aea343142 100644
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/lex-line.sh b/t/lex-line.sh
index e8833595b..a150c10c5 100644
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index 42cbfdffc..96a6183ff 100644
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 0e6e75a39..be64aad4f 100644
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
index 13d187fc9..b647e8917 100644
--- a/t/lex-noyywrap.sh
+++ b/t/lex-noyywrap.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index 616513bfb..d201b5329 100644
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index 63fc75ec2..432050cdd 100644
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/lex.sh b/t/lex.sh
index 2ec6feb3e..fe47a507f 100644
--- a/t/lex.sh
+++ b/t/lex.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/lex2.sh b/t/lex2.sh
index acaf65521..5f125178b 100644
--- a/t/lex2.sh
+++ b/t/lex2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/lex3.sh b/t/lex3.sh
index 5ac048689..cb572aef2 100644
--- a/t/lex3.sh
+++ b/t/lex3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/lex5.sh b/t/lex5.sh
index 9fb2565bb..cd7e2f2ac 100644
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
index 6fb1f0cb3..ef0aa09db 100644
--- a/t/lexcpp.sh
+++ b/t/lexcpp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index 0dd41af9a..14622da40 100644
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/lflags-cxx.sh b/t/lflags-cxx.sh
index 4edb7f959..96987118b 100644
--- a/t/lflags-cxx.sh
+++ b/t/lflags-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/lflags.sh b/t/lflags.sh
index 4b0179edf..d0c9dc4b2 100644
--- a/t/lflags.sh
+++ b/t/lflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libexec.sh b/t/libexec.sh
index 18c6e62ef..7f8f430d8 100644
--- a/t/libexec.sh
+++ b/t/libexec.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
index 87cc5ed44..5c49c1425 100644
--- a/t/libobj-basic.sh
+++ b/t/libobj-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj-no-dependency-tracking.sh b/t/libobj-no-dependency-tracking.sh
index ddc707d16..d9f16019a 100644
--- a/t/libobj-no-dependency-tracking.sh
+++ b/t/libobj-no-dependency-tracking.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2017-2020 Free Software Foundation, Inc.
+# Copyright (C) 2017-2021 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
diff --git a/t/libobj10.sh b/t/libobj10.sh
index 8099a6514..ecce3f6b7 100644
--- a/t/libobj10.sh
+++ b/t/libobj10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/libobj12.sh b/t/libobj12.sh
index 720e358b6..9761494db 100644
--- a/t/libobj12.sh
+++ b/t/libobj12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libobj13.sh b/t/libobj13.sh
index df0e1353c..f872f9753 100644
--- a/t/libobj13.sh
+++ b/t/libobj13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libobj14.sh b/t/libobj14.sh
index d81f6797f..701a1181a 100644
--- a/t/libobj14.sh
+++ b/t/libobj14.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
index d834a09fd..8d53ae65e 100644
--- a/t/libobj15a.sh
+++ b/t/libobj15a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
index d2786aba2..e04f6c105 100644
--- a/t/libobj15b.sh
+++ b/t/libobj15b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
index 85274535e..0bbd59397 100644
--- a/t/libobj15c.sh
+++ b/t/libobj15c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
index 36d77f330..7753fd53f 100644
--- a/t/libobj16a.sh
+++ b/t/libobj16a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
index 73d86a665..09cac5425 100644
--- a/t/libobj16b.sh
+++ b/t/libobj16b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj17.sh b/t/libobj17.sh
index a4880c324..27c6dfa6c 100644
--- a/t/libobj17.sh
+++ b/t/libobj17.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj18.sh b/t/libobj18.sh
index 10c527bdf..8fdc54ad1 100644
--- a/t/libobj18.sh
+++ b/t/libobj18.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj19.sh b/t/libobj19.sh
index 3a151cf86..5b6455b7b 100644
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj2.sh b/t/libobj2.sh
index 60fafa44a..18e1d9f7c 100644
--- a/t/libobj2.sh
+++ b/t/libobj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/libobj20a.sh b/t/libobj20a.sh
index 60d23f410..011971ec8 100644
--- a/t/libobj20a.sh
+++ b/t/libobj20a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index 2690e2a1e..d4947fe9c 100644
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index 912652b58..3210292df 100644
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/libobj3.sh b/t/libobj3.sh
index 2d29bc73a..d4e0abe4b 100644
--- a/t/libobj3.sh
+++ b/t/libobj3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/libobj4.sh b/t/libobj4.sh
index e91325fd4..75a7f5523 100644
--- a/t/libobj4.sh
+++ b/t/libobj4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/libobj5.sh b/t/libobj5.sh
index 9cfdfd169..738d3e332 100644
--- a/t/libobj5.sh
+++ b/t/libobj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/libobj7.sh b/t/libobj7.sh
index 06c44e035..76303443e 100644
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/library.sh b/t/library.sh
index 8c4a2fb7f..62556ed9b 100644
--- a/t/library.sh
+++ b/t/library.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/library2.sh b/t/library2.sh
index ddcfe1f0d..7d3a80835 100644
--- a/t/library2.sh
+++ b/t/library2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/library3.sh b/t/library3.sh
index 43f719f2e..4a33fec50 100644
--- a/t/library3.sh
+++ b/t/library3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
index 7e2926c95..197b89673 100644
--- a/t/libtoo10.sh
+++ b/t/libtoo10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
index d4cca45ed..0c556bae4 100644
--- a/t/libtoo11.sh
+++ b/t/libtoo11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index e99d71baa..389e2b260 100644
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/libtool.sh b/t/libtool.sh
index 9809fee2a..6b407ffd0 100644
--- a/t/libtool.sh
+++ b/t/libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/libtool2.sh b/t/libtool2.sh
index 3653e714a..2857d2730 100644
--- a/t/libtool2.sh
+++ b/t/libtool2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/libtool3.sh b/t/libtool3.sh
index c0dfdadf8..ffc11f400 100644
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libtool4.sh b/t/libtool4.sh
index d4d6b1352..d82db8f5f 100644
--- a/t/libtool4.sh
+++ b/t/libtool4.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libtool5.sh b/t/libtool5.sh
index cd01888dd..f160f4569 100644
--- a/t/libtool5.sh
+++ b/t/libtool5.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libtool6.sh b/t/libtool6.sh
index 19899ed3e..0f1a3910c 100644
--- a/t/libtool6.sh
+++ b/t/libtool6.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/libtool7.sh b/t/libtool7.sh
index 4982f6c12..f600c320e 100644
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/libtool8.sh b/t/libtool8.sh
index c6960e41e..f7a3f4fb6 100644
--- a/t/libtool8.sh
+++ b/t/libtool8.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/libtool9.sh b/t/libtool9.sh
index 34354a60e..d3b22018f 100644
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/license.sh b/t/license.sh
index dbd17ec34..fd72703f5 100644
--- a/t/license.sh
+++ b/t/license.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/license2.sh b/t/license2.sh
index 1b359ff76..c8dcde85d 100644
--- a/t/license2.sh
+++ b/t/license2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
index a3463a7ce..0e9defcf4 100644
--- a/t/link_c_cxx.sh
+++ b/t/link_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_cond.sh b/t/link_cond.sh
index 02a74042e..210cbcff3 100644
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/link_dist.sh b/t/link_dist.sh
index ea1b8b1d8..2e2f78d08 100644
--- a/t/link_dist.sh
+++ b/t/link_dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
index 3f05d5269..3ae78efe8 100644
--- a/t/link_f90_only.sh
+++ b/t/link_f90_only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
index 6f4aea1af..8c0cb2636 100644
--- a/t/link_f_only.sh
+++ b/t/link_f_only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_fc.sh b/t/link_fc.sh
index 5d49dc84c..6f8285b33 100644
--- a/t/link_fc.sh
+++ b/t/link_fc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
index 4dca8f42b..224f86c8c 100644
--- a/t/link_fccxx.sh
+++ b/t/link_fccxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
index d0fe9a95d..8a4c00a03 100644
--- a/t/link_fcxx.sh
+++ b/t/link_fcxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/link_override.sh b/t/link_override.sh
index 72e5395bf..81787af91 100644
--- a/t/link_override.sh
+++ b/t/link_override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
@@ -27,6 +27,8 @@ bin_PROGRAMS = foo bar baz boo
foo_LINK = $(LINK)
bar_LINK = $(LINK)
bar_LDFLAGS = $(AM_LDFLAGS)
+baz_LINK = $(LINK)
+AM_V_baz_LINK = xyz
END
$ACLOCAL
@@ -41,4 +43,9 @@ grep '.\$(LINK).*foo' Makefile.in && exit 1
grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && exit 1
grep '.\$(bar_LINK).*bar' Makefile.in
+# Silent make rules should use AM_V_GEN unless overriden.
+grep '.\$(AM_V_GEN)\$(foo_LINK)' Makefile.in
+grep '.\$(AM_V_baz_LINK)\$(baz_LINK)' Makefile.in
+grep '.\$(AM_V_GEN)\$(baz_LINK)' Makefile.in && exit 1
+
exit 0
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index 79926cc2a..ae93e9998 100644
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 0e972d552..4e0057e65 100644
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lisp-pr11806.sh b/t/lisp-pr11806.sh
index 187e5242d..b408008cf 100644
--- a/t/lisp-pr11806.sh
+++ b/t/lisp-pr11806.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lisp-readonly-srcdir.sh b/t/lisp-readonly-srcdir.sh
index 5416343f8..e98853333 100644
--- a/t/lisp-readonly-srcdir.sh
+++ b/t/lisp-readonly-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2017-2020 Free Software Foundation, Inc.
+# Copyright (C) 2017-2021 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
diff --git a/t/lisp-subdir-mix.sh b/t/lisp-subdir-mix.sh
index 839b1f9ee..854967952 100644
--- a/t/lisp-subdir-mix.sh
+++ b/t/lisp-subdir-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lisp-subdir.sh b/t/lisp-subdir.sh
index 60298dc09..212c2a50c 100644
--- a/t/lisp-subdir.sh
+++ b/t/lisp-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
index 9b71fc44d..08019101a 100644
--- a/t/lisp-subdir2.sh
+++ b/t/lisp-subdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/lisp2.sh b/t/lisp2.sh
index 11b49d1a5..2accaba6c 100644
--- a/t/lisp2.sh
+++ b/t/lisp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/lisp3.sh b/t/lisp3.sh
index aeb645aa1..ab0fb8542 100644
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/lisp4.sh b/t/lisp4.sh
index 933d6464c..57444e0f0 100644
--- a/t/lisp4.sh
+++ b/t/lisp4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/lisp5.sh b/t/lisp5.sh
index 390357cb5..d28b25200 100644
--- a/t/lisp5.sh
+++ b/t/lisp5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/lisp6.sh b/t/lisp6.sh
index 23c5a5e60..f892ed33c 100644
--- a/t/lisp6.sh
+++ b/t/lisp6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/lisp7.sh b/t/lisp7.sh
index 9a3a65a96..9b71aeccb 100644
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 1eac2e086..8a1d4329a 100644
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/lispdry.sh b/t/lispdry.sh
index b62a3cb6f..f622d2354 100644
--- a/t/lispdry.sh
+++ b/t/lispdry.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index a3cb0004f..277e330a8 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -2,7 +2,7 @@
## testsuite. This fragment is meant to be included by the Makefile.am,
## but also to be executed directly by make when bootstrapping automake.
-## Copyright (C) 2011-2020 Free Software Foundation, Inc.
+## Copyright (C) 2011-2021 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
@@ -410,6 +410,7 @@ t/dist-missing-m4.sh \
t/dist-readonly.sh \
t/dist-repeated.sh \
t/dist-pr109765.sh \
+t/dist-no-built-sources.sh \
t/dist-vs-built-sources.sh \
t/distcleancheck.sh \
t/distcom2.sh \
@@ -848,6 +849,7 @@ t/test-trs-recover.sh \
t/test-trs-recover2.sh \
t/test-extensions.sh \
t/test-extensions-cond.sh \
+t/toplevelmd.sh \
t/parse.sh \
t/percent.sh \
t/percent2.sh \
@@ -926,6 +928,7 @@ t/python-am-path-iftrue.sh \
t/python-missing.sh \
t/python-too-old.sh \
t/python-dist.sh \
+t/python-prefix.sh \
t/python-vars.sh \
t/python-virtualenv.sh \
t/python-pr10995.sh \
diff --git a/t/listval.sh b/t/listval.sh
index 0cef2c363..e4addda66 100644
--- a/t/listval.sh
+++ b/t/listval.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/local.mk b/t/local.mk
index 51fd86404..7497d1f63 100644
--- a/t/local.mk
+++ b/t/local.mk
@@ -1,5 +1,5 @@
## -*- makefile-automake -*-
-## Copyright (C) 1995-2020 Free Software Foundation, Inc.
+## Copyright (C) 1995-2021 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
diff --git a/t/location.sh b/t/location.sh
index d194037b1..e922ff884 100644
--- a/t/location.sh
+++ b/t/location.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/longlin2.sh b/t/longlin2.sh
index 7f49f74b1..f1ea55f7f 100644
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/longline.sh b/t/longline.sh
index d0347431b..fb88a7ede 100644
--- a/t/longline.sh
+++ b/t/longline.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/ltcond.sh b/t/ltcond.sh
index 0a7cc068f..66577f170 100644
--- a/t/ltcond.sh
+++ b/t/ltcond.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index 77e486157..77621e37a 100644
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/ltconv.sh b/t/ltconv.sh
index 565944bbe..84a87c3b0 100644
--- a/t/ltconv.sh
+++ b/t/ltconv.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
index 94fd69c96..5aeba9706 100644
--- a/t/ltdeps.sh
+++ b/t/ltdeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/ltinit.sh b/t/ltinit.sh
index 0d0b8503d..613683b58 100644
--- a/t/ltinit.sh
+++ b/t/ltinit.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
index bdaab2484..1e57b2569 100644
--- a/t/ltinstloc.sh
+++ b/t/ltinstloc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
index c3b9a50ea..f3b3d1da0 100644
--- a/t/ltlibobjs.sh
+++ b/t/ltlibobjs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
index 282dc93f4..39a8dde0e 100644
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/ltorder.sh b/t/ltorder.sh
index a2926feb9..ed7b1b948 100644
--- a/t/ltorder.sh
+++ b/t/ltorder.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
index cd9f3253f..51c8a71e3 100644
--- a/t/m4-inclusion.sh
+++ b/t/m4-inclusion.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
index 48a0b4e6b..67d6022d0 100644
--- a/t/maintclean-vpath.sh
+++ b/t/maintclean-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/maintclean.sh b/t/maintclean.sh
index 4411ae626..f5720332d 100644
--- a/t/maintclean.sh
+++ b/t/maintclean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
index c5c534a51..0ca0ca2a1 100644
--- a/t/maintmode-configure-msg.sh
+++ b/t/maintmode-configure-msg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 061526bf9..12d469eaf 100644
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/make-is-gnu.sh b/t/make-is-gnu.sh
index a805f5ce1..bcbfd76b1 100644
--- a/t/make-is-gnu.sh
+++ b/t/make-is-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/make-keepgoing.tap b/t/make-keepgoing.tap
index 3162b616a..fe3ff4869 100644
--- a/t/make-keepgoing.tap
+++ b/t/make-keepgoing.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/make.sh b/t/make.sh
index 00ee67e0c..1ec3cd401 100644
--- a/t/make.sh
+++ b/t/make.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
index eeea5af0a..12c1d9538 100644
--- a/t/makefile-deps.sh
+++ b/t/makefile-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/makej.sh b/t/makej.sh
index f01f14d7d..5620f9a42 100644
--- a/t/makej.sh
+++ b/t/makej.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/makej2.sh b/t/makej2.sh
index 283df3fa0..830d8b674 100644
--- a/t/makej2.sh
+++ b/t/makej2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/maken.sh b/t/maken.sh
index e19f3f4d8..3034c01eb 100644
--- a/t/maken.sh
+++ b/t/maken.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/maken3.sh b/t/maken3.sh
index 4c53f0e67..4b54ece04 100644
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/makevars.sh b/t/makevars.sh
index 33d90422a..5439480d0 100644
--- a/t/makevars.sh
+++ b/t/makevars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/man.sh b/t/man.sh
index 70a398c98..d1d8d033e 100644
--- a/t/man.sh
+++ b/t/man.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/man2.sh b/t/man2.sh
index 76ab12baa..7dbfcf525 100644
--- a/t/man2.sh
+++ b/t/man2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/man3.sh b/t/man3.sh
index 2b327ed5f..732797158 100644
--- a/t/man3.sh
+++ b/t/man3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/man5.sh b/t/man5.sh
index e4dc6bfb6..c34db4051 100644
--- a/t/man5.sh
+++ b/t/man5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/man6.sh b/t/man6.sh
index b354ec9ad..824fd3e1f 100644
--- a/t/man6.sh
+++ b/t/man6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/man7.sh b/t/man7.sh
index 3077bb963..4ac3d1659 100644
--- a/t/man7.sh
+++ b/t/man7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/man8.sh b/t/man8.sh
index e1a353eb7..02e3d500f 100644
--- a/t/man8.sh
+++ b/t/man8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/mdate.sh b/t/mdate.sh
index 0f7c5a847..bc50a62b6 100644
--- a/t/mdate.sh
+++ b/t/mdate.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/mdate2.sh b/t/mdate2.sh
index ea63f408d..07cc00dca 100644
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/mdate3.sh b/t/mdate3.sh
index e26e27c45..f8eda05f0 100644
--- a/t/mdate3.sh
+++ b/t/mdate3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/mdate4.sh b/t/mdate4.sh
index 0f2cb57c8..a23bb6f70 100644
--- a/t/mdate4.sh
+++ b/t/mdate4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/mdate5.sh b/t/mdate5.sh
index 96f0bac55..6dcf5ccb6 100644
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/mdate6.sh b/t/mdate6.sh
index 1dccbf06b..b8a7b969b 100644
--- a/t/mdate6.sh
+++ b/t/mdate6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh
index 7be24a7a8..7330d640e 100644
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/missing-version-mismatch.sh b/t/missing-version-mismatch.sh
index 12a8bcf9d..6f980cfb3 100644
--- a/t/missing-version-mismatch.sh
+++ b/t/missing-version-mismatch.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/missing3.sh b/t/missing3.sh
index 51a6047d5..4e1d2ae05 100644
--- a/t/missing3.sh
+++ b/t/missing3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/mkdir_p.sh b/t/mkdir_p.sh
index 04f3bad1c..d850fb8ee 100644
--- a/t/mkdir_p.sh
+++ b/t/mkdir_p.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
index a356bf1f1..92c3a573d 100644
--- a/t/mkdirp-deprecation.sh
+++ b/t/mkdirp-deprecation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
index ca5879bf0..033e87d73 100644
--- a/t/mkinst2.sh
+++ b/t/mkinst2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
index b49a2b688..9cbb7d10e 100644
--- a/t/mkinst3.sh
+++ b/t/mkinst3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/mkinstall.sh b/t/mkinstall.sh
index d461e9277..a999ca636 100644
--- a/t/mkinstall.sh
+++ b/t/mkinstall.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/mmode.sh b/t/mmode.sh
index bd0218d62..5793c11b9 100644
--- a/t/mmode.sh
+++ b/t/mmode.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/mmodely.sh b/t/mmodely.sh
index c5e3e984f..4c5dbd6b9 100644
--- a/t/mmodely.sh
+++ b/t/mmodely.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/no-extra-c-stuff.sh b/t/no-extra-c-stuff.sh
index 3b538f830..50ca1cf53 100644
--- a/t/no-extra-c-stuff.sh
+++ b/t/no-extra-c-stuff.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
index e889985ff..e8306c8a1 100644
--- a/t/no-extra-makefile-code.sh
+++ b/t/no-extra-makefile-code.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/no-spurious-install-recursive.sh b/t/no-spurious-install-recursive.sh
index b55c401ce..8031ff371 100644
--- a/t/no-spurious-install-recursive.sh
+++ b/t/no-spurious-install-recursive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
index a73d216fb..f1c66363a 100644
--- a/t/nobase-libtool.sh
+++ b/t/nobase-libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
index 8966f9bcd..cdf19324c 100644
--- a/t/nobase-nodist.sh
+++ b/t/nobase-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
index 29d24f45a..d12bf48d9 100644
--- a/t/nobase-python.sh
+++ b/t/nobase-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/nobase.sh b/t/nobase.sh
index 250b8490b..1c9dc2197 100644
--- a/t/nobase.sh
+++ b/t/nobase.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/nodef.sh b/t/nodef.sh
index 84a27ca3d..99c19dfc0 100644
--- a/t/nodef.sh
+++ b/t/nodef.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/nodef2.sh b/t/nodef2.sh
index 1d72ead46..1018bc346 100644
--- a/t/nodef2.sh
+++ b/t/nodef2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/nodep.sh b/t/nodep.sh
index d2e86e855..365b6b326 100644
--- a/t/nodep.sh
+++ b/t/nodep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/nodep2.sh b/t/nodep2.sh
index 8b34de7ec..4ea2e0eb1 100644
--- a/t/nodep2.sh
+++ b/t/nodep2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
index 5bf5e9ce7..5f2992988 100644
--- a/t/nodepcomp.sh
+++ b/t/nodepcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/nodist.sh b/t/nodist.sh
index 34e5f9f85..b4b526347 100644
--- a/t/nodist.sh
+++ b/t/nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/nodist2.sh b/t/nodist2.sh
index e639bceac..4755b7b85 100644
--- a/t/nodist2.sh
+++ b/t/nodist2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/nodist3.sh b/t/nodist3.sh
index 8a9a07ba8..de5aac924 100644
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/noinst.sh b/t/noinst.sh
index cff36869b..424864f2a 100644
--- a/t/noinst.sh
+++ b/t/noinst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index f8930c703..e8af36c3e 100644
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/nolink.sh b/t/nolink.sh
index 8623b4078..439844f7b 100644
--- a/t/nolink.sh
+++ b/t/nolink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
index 37be18e36..e1fb8dee0 100644
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/notrans.sh b/t/notrans.sh
index a23f138ae..ece71fedf 100644
--- a/t/notrans.sh
+++ b/t/notrans.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/number.sh b/t/number.sh
index bdd20566c..f3ec0f710 100644
--- a/t/number.sh
+++ b/t/number.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/objc-basic.sh b/t/objc-basic.sh
index 9a1221ea9..5c93686a4 100644
--- a/t/objc-basic.sh
+++ b/t/objc-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
index 374d99d86..c61615014 100644
--- a/t/objc-deps.sh
+++ b/t/objc-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index d91cdc9a1..c19064830 100644
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
index b03015b67..11544ea4f 100644
--- a/t/objc-megademo.sh
+++ b/t/objc-megademo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
index be7db9822..012c7a9a8 100644
--- a/t/objc-minidemo.sh
+++ b/t/objc-minidemo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
index 48b110f9c..d1a30a783 100644
--- a/t/objcxx-basic.sh
+++ b/t/objcxx-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index 136775781..082e0be41 100644
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index 973795952..2f8703527 100644
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index 0cc234892..2881ba07d 100644
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
index 7e46c7994..8069548a7 100644
--- a/t/objext-pr10128.sh
+++ b/t/objext-pr10128.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/oldvars.sh b/t/oldvars.sh
index 261be6033..5585a25f7 100644
--- a/t/oldvars.sh
+++ b/t/oldvars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/order.sh b/t/order.sh
index ec98dfca7..2607c02e8 100644
--- a/t/order.sh
+++ b/t/order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/output-order.sh b/t/output-order.sh
index a3fb5a40c..6a46b26e6 100644
--- a/t/output-order.sh
+++ b/t/output-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/output.sh b/t/output.sh
index b64baa3bd..f53ab4c50 100644
--- a/t/output.sh
+++ b/t/output.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/output10.sh b/t/output10.sh
index 652abb517..ec637117d 100644
--- a/t/output10.sh
+++ b/t/output10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/output11.sh b/t/output11.sh
index 37d9e3d22..064877ff2 100644
--- a/t/output11.sh
+++ b/t/output11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/output12.sh b/t/output12.sh
index edff2c681..8c74ba5aa 100644
--- a/t/output12.sh
+++ b/t/output12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/output13.sh b/t/output13.sh
index a2ae05f67..27804a29c 100644
--- a/t/output13.sh
+++ b/t/output13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/output2.sh b/t/output2.sh
index 2a44a8366..50eec5bf9 100644
--- a/t/output2.sh
+++ b/t/output2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/output3.sh b/t/output3.sh
index b61007d11..e663caf22 100644
--- a/t/output3.sh
+++ b/t/output3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/output4.sh b/t/output4.sh
index ed993d376..bb6a097f1 100644
--- a/t/output4.sh
+++ b/t/output4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/output5.sh b/t/output5.sh
index 7070af155..ecd3ddb7e 100644
--- a/t/output5.sh
+++ b/t/output5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/output6.sh b/t/output6.sh
index 6c748926c..0861a9390 100644
--- a/t/output6.sh
+++ b/t/output6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/output7.sh b/t/output7.sh
index d649bdf34..e87dd10fb 100644
--- a/t/output7.sh
+++ b/t/output7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/output8.sh b/t/output8.sh
index 4bd91b7d5..f180d3a55 100644
--- a/t/output8.sh
+++ b/t/output8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/output9.sh b/t/output9.sh
index e4a40f9f0..a2e4f0577 100644
--- a/t/output9.sh
+++ b/t/output9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
index 6f8492678..9b9b24b5a 100644
--- a/t/override-conditional-1.sh
+++ b/t/override-conditional-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
index cef70dfd0..73de69d40 100644
--- a/t/override-conditional-2.sh
+++ b/t/override-conditional-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/override-conditional-pr13940.sh b/t/override-conditional-pr13940.sh
index 1094e1d8e..49d10c916 100644
--- a/t/override-conditional-pr13940.sh
+++ b/t/override-conditional-pr13940.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/override-html.sh b/t/override-html.sh
index 2d5dad655..e9056493a 100644
--- a/t/override-html.sh
+++ b/t/override-html.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
index c548ad314..2c2e9010a 100644
--- a/t/override-suggest-local.sh
+++ b/t/override-suggest-local.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
index df7625aeb..94c3cc298 100644
--- a/t/parallel-am.sh
+++ b/t/parallel-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
index 47090c863..26bc9b520 100644
--- a/t/parallel-am2.sh
+++ b/t/parallel-am2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
index 2364999b5..eb670d4c5 100644
--- a/t/parallel-am3.sh
+++ b/t/parallel-am3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh
index 1b494f1a4..335f54938 100644
--- a/t/parallel-tests-basics.sh
+++ b/t/parallel-tests-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-cmdline-override.sh b/t/parallel-tests-cmdline-override.sh
index 5ae02d891..5cbc5afb7 100644
--- a/t/parallel-tests-cmdline-override.sh
+++ b/t/parallel-tests-cmdline-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-concurrency-2.sh b/t/parallel-tests-concurrency-2.sh
index 0b15374d2..38829bf09 100644
--- a/t/parallel-tests-concurrency-2.sh
+++ b/t/parallel-tests-concurrency-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index 68126b714..f66f230c9 100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh
index df660a1a5..37d80b2b2 100644
--- a/t/parallel-tests-console-output.sh
+++ b/t/parallel-tests-console-output.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh
index 3f3289bdb..ecb9beb6d 100644
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
index 710d004a4..136265f66 100644
--- a/t/parallel-tests-dry-run-1.sh
+++ b/t/parallel-tests-dry-run-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
index 0c65b2ecd..329f14af5 100644
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-empty-testlogs.sh b/t/parallel-tests-empty-testlogs.sh
index a1ada3882..5e44ee862 100644
--- a/t/parallel-tests-empty-testlogs.sh
+++ b/t/parallel-tests-empty-testlogs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-empty.sh b/t/parallel-tests-empty.sh
index 062bd88be..0c700e1dc 100644
--- a/t/parallel-tests-empty.sh
+++ b/t/parallel-tests-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index b3bb8cd00..273132705 100644
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-exit-status-reported.sh b/t/parallel-tests-exit-status-reported.sh
index 35114d081..a9884816c 100644
--- a/t/parallel-tests-exit-status-reported.sh
+++ b/t/parallel-tests-exit-status-reported.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh
index a52c1c803..56e5bae77 100644
--- a/t/parallel-tests-exit-statuses.sh
+++ b/t/parallel-tests-exit-statuses.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh
index 9f561617d..807eda5fd 100644
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-fd-redirect-exeext.sh b/t/parallel-tests-fd-redirect-exeext.sh
index a3d88263d..291cba05a 100644
--- a/t/parallel-tests-fd-redirect-exeext.sh
+++ b/t/parallel-tests-fd-redirect-exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
index 26ed18163..e15286f05 100644
--- a/t/parallel-tests-fd-redirect.sh
+++ b/t/parallel-tests-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 6116b998c..74a0be5e9 100644
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-generated-and-distributed.sh b/t/parallel-tests-generated-and-distributed.sh
index 531e7027b..7df31b63c 100644
--- a/t/parallel-tests-generated-and-distributed.sh
+++ b/t/parallel-tests-generated-and-distributed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
index 516bf1236..4cb2575df 100644
--- a/t/parallel-tests-harderror.sh
+++ b/t/parallel-tests-harderror.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index a1401e5c1..9a5d88e09 100644
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-log-compiler-1.sh b/t/parallel-tests-log-compiler-1.sh
index 229479d33..3d7de5d5c 100644
--- a/t/parallel-tests-log-compiler-1.sh
+++ b/t/parallel-tests-log-compiler-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-log-compiler-2.sh b/t/parallel-tests-log-compiler-2.sh
index 42607fa31..4c2ce5c99 100644
--- a/t/parallel-tests-log-compiler-2.sh
+++ b/t/parallel-tests-log-compiler-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-log-compiler-example.sh b/t/parallel-tests-log-compiler-example.sh
index 791d50886..311d3284f 100644
--- a/t/parallel-tests-log-compiler-example.sh
+++ b/t/parallel-tests-log-compiler-example.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-log-override-1.sh b/t/parallel-tests-log-override-1.sh
index 77c123812..f3eb0a9e8 100644
--- a/t/parallel-tests-log-override-1.sh
+++ b/t/parallel-tests-log-override-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-log-override-2.sh b/t/parallel-tests-log-override-2.sh
index 233e3b116..6cbe105b4 100644
--- a/t/parallel-tests-log-override-2.sh
+++ b/t/parallel-tests-log-override-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-log-override-recheck.sh b/t/parallel-tests-log-override-recheck.sh
index 930d890b1..31da37710 100644
--- a/t/parallel-tests-log-override-recheck.sh
+++ b/t/parallel-tests-log-override-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh
index 5ba761344..3febb9a2a 100644
--- a/t/parallel-tests-no-color-in-log.sh
+++ b/t/parallel-tests-no-color-in-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-no-spurious-summary.sh b/t/parallel-tests-no-spurious-summary.sh
index d5c55d188..4d2b0b38f 100644
--- a/t/parallel-tests-no-spurious-summary.sh
+++ b/t/parallel-tests-no-spurious-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
index a0ba16536..f2b9e2bc7 100644
--- a/t/parallel-tests-once.sh
+++ b/t/parallel-tests-once.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh
index d815bed4b..2f2891640 100644
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh
index 18e5133fa..336cbb0c8 100644
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/parallel-tests-recheck.sh b/t/parallel-tests-recheck.sh
index c150af4de..3f69f5cbd 100644
--- a/t/parallel-tests-recheck.sh
+++ b/t/parallel-tests-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index 2667c51cd..745c8e5e1 100644
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
index 5d823988d..9d3673e2d 100644
--- a/t/parallel-tests-subdir.sh
+++ b/t/parallel-tests-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index 4a3e438cf..66ab0f071 100644
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
index a7a655d70..063b65249 100644
--- a/t/parallel-tests-suffix.sh
+++ b/t/parallel-tests-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-trailing-whitespace.sh b/t/parallel-tests-trailing-whitespace.sh
index 34b4d2dde..6cd5cc011 100644
--- a/t/parallel-tests-trailing-whitespace.sh
+++ b/t/parallel-tests-trailing-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
index cbb6c148d..3c7f73a89 100644
--- a/t/parallel-tests-unreadable.sh
+++ b/t/parallel-tests-unreadable.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/parse.sh b/t/parse.sh
index 061c32250..58948be1f 100644
--- a/t/parse.sh
+++ b/t/parse.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index bb071a01a..0628a4921 100644
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/percent.sh b/t/percent.sh
index f1d54591c..fdf1c3a6a 100644
--- a/t/percent.sh
+++ b/t/percent.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/percent2.sh b/t/percent2.sh
index d91661bfb..523da158b 100644
--- a/t/percent2.sh
+++ b/t/percent2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/perf/cond.sh b/t/perf/cond.sh
index 1d57cc452..c47b20a86 100755
--- a/t/perf/cond.sh
+++ b/t/perf/cond.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/perf/testsuite-recheck.sh b/t/perf/testsuite-recheck.sh
index d8fc7fb4a..2824a31b0 100755
--- a/t/perf/testsuite-recheck.sh
+++ b/t/perf/testsuite-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index dd7c69d0a..f35c145f3 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/phony.sh b/t/phony.sh
index dde61baa5..c17b9852c 100644
--- a/t/phony.sh
+++ b/t/phony.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index 0c13b094f..2fd4c544b 100644
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/pluseq.sh b/t/pluseq.sh
index 6e38bd2cd..1a26360df 100644
--- a/t/pluseq.sh
+++ b/t/pluseq.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
index 925b42a84..e8a871d6f 100644
--- a/t/pluseq10.sh
+++ b/t/pluseq10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
index 9514bf2c9..84b8a74a0 100644
--- a/t/pluseq11.sh
+++ b/t/pluseq11.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
index 67dc9bc96..0bcf92f65 100644
--- a/t/pluseq2.sh
+++ b/t/pluseq2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
index 65091eb13..6af366ed4 100644
--- a/t/pluseq3.sh
+++ b/t/pluseq3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
index 95803c916..ea1bd3d64 100644
--- a/t/pluseq4.sh
+++ b/t/pluseq4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index 5eb4100b4..db04a96df 100644
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
index aab53df06..84d301e82 100644
--- a/t/pluseq6.sh
+++ b/t/pluseq6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index 989431e0b..e4248672a 100644
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
index e1df406c2..4b4906615 100644
--- a/t/pluseq8.sh
+++ b/t/pluseq8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
index 43bae00b6..3b201cb26 100644
--- a/t/pluseq9.sh
+++ b/t/pluseq9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pm/Cond2.pl b/t/pm/Cond2.pl
index bfe6b9ae7..20f7cc0b1 100644
--- a/t/pm/Cond2.pl
+++ b/t/pm/Cond2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/Cond3.pl b/t/pm/Cond3.pl
index b23d14d4a..4a1fb6141 100644
--- a/t/pm/Cond3.pl
+++ b/t/pm/Cond3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/Condition-t.pl b/t/pm/Condition-t.pl
index bb74ef0e5..e9266819f 100644
--- a/t/pm/Condition-t.pl
+++ b/t/pm/Condition-t.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pm/Condition.pl b/t/pm/Condition.pl
index c49346366..ce4cd2a5c 100644
--- a/t/pm/Condition.pl
+++ b/t/pm/Condition.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
index 753a919ac..a2d12af8a 100644
--- a/t/pm/DisjCon2.pl
+++ b/t/pm/DisjCon2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
index ddf760197..51849d9b6 100644
--- a/t/pm/DisjCon3.pl
+++ b/t/pm/DisjCon3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/DisjConditions-t.pl b/t/pm/DisjConditions-t.pl
index 4f5d40bc2..11c7c86a9 100644
--- a/t/pm/DisjConditions-t.pl
+++ b/t/pm/DisjConditions-t.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pm/DisjConditions.pl b/t/pm/DisjConditions.pl
index 9abd3d6f6..03a1c004c 100644
--- a/t/pm/DisjConditions.pl
+++ b/t/pm/DisjConditions.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pm/General.pl b/t/pm/General.pl
index 4014bea4e..28d0d57b2 100644
--- a/t/pm/General.pl
+++ b/t/pm/General.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 Free Software Foundation, Inc.
+# Copyright (C) 2018-2021 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
diff --git a/t/pm/Version.pl b/t/pm/Version.pl
index 054ff8015..7cea63f86 100644
--- a/t/pm/Version.pl
+++ b/t/pm/Version.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pm/Version2.pl b/t/pm/Version2.pl
index 8f9996bba..b9a19a47d 100644
--- a/t/pm/Version2.pl
+++ b/t/pm/Version2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/Version3.pl b/t/pm/Version3.pl
index e8abf87ff..2781608d5 100644
--- a/t/pm/Version3.pl
+++ b/t/pm/Version3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/pm/Wrap.pl b/t/pm/Wrap.pl
index 0160b62c3..78660971e 100644
--- a/t/pm/Wrap.pl
+++ b/t/pm/Wrap.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
index c81e64f0d..a0a098f47 100644
--- a/t/posixsubst-data.sh
+++ b/t/posixsubst-data.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
index 743747a9e..6c6dcc800 100644
--- a/t/posixsubst-extradist.sh
+++ b/t/posixsubst-extradist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index 5c7deab3a..3b23861e6 100644
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index 2368668f3..f8a44fcc7 100644
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 95c1d0076..b03a2576d 100644
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
index df9c3a855..6af3bd7f1 100644
--- a/t/posixsubst-programs.sh
+++ b/t/posixsubst-programs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index a935656aa..69b23082d 100644
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index ffe479a41..d0c8452b9 100644
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
index 4edfcaebb..e426a546a 100644
--- a/t/posixsubst-tests.sh
+++ b/t/posixsubst-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/ppf77.sh b/t/ppf77.sh
index d33f3f8f1..7607d696f 100644
--- a/t/ppf77.sh
+++ b/t/ppf77.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pr2.sh b/t/pr2.sh
index b24288010..6b1949001 100644
--- a/t/pr2.sh
+++ b/t/pr2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/pr211.sh b/t/pr211.sh
index 17dee0114..293a35889 100644
--- a/t/pr211.sh
+++ b/t/pr211.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr220.sh b/t/pr220.sh
index 656de90c8..16bed585c 100644
--- a/t/pr220.sh
+++ b/t/pr220.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr224.sh b/t/pr224.sh
index 7cd52ad67..b70412fb3 100644
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr229.sh b/t/pr229.sh
index 5c98ba441..14cfa17be 100644
--- a/t/pr229.sh
+++ b/t/pr229.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr243.sh b/t/pr243.sh
index 8d115f678..c75c60b60 100644
--- a/t/pr243.sh
+++ b/t/pr243.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr266.sh b/t/pr266.sh
index 798366bfd..5ff0a7927 100644
--- a/t/pr266.sh
+++ b/t/pr266.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
index e10308113..a66289f4f 100644
--- a/t/pr279-2.sh
+++ b/t/pr279-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr279.sh b/t/pr279.sh
index 3fc2e6a43..081a7d76d 100644
--- a/t/pr279.sh
+++ b/t/pr279.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/pr287.sh b/t/pr287.sh
index 73fcf31d8..6682451e1 100644
--- a/t/pr287.sh
+++ b/t/pr287.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
index 308dd6846..35d7e0072 100644
--- a/t/pr300-lib.sh
+++ b/t/pr300-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
index a8d915f93..f175878b9 100644
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
index 583571d84..0f6480491 100644
--- a/t/pr300-prog.sh
+++ b/t/pr300-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr307.sh b/t/pr307.sh
index c99995583..b78fc015e 100644
--- a/t/pr307.sh
+++ b/t/pr307.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/pr401.sh b/t/pr401.sh
index 00d9571ad..5441e507d 100644
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/pr401b.sh b/t/pr401b.sh
index 795cd8644..c75d84632 100644
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/pr401c.sh b/t/pr401c.sh
index ab3031286..42351813b 100644
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/pr72.sh b/t/pr72.sh
index 95e16269a..4a46a1a41 100644
--- a/t/pr72.sh
+++ b/t/pr72.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/pr87.sh b/t/pr87.sh
index 5e4cd8609..71692c726 100644
--- a/t/pr87.sh
+++ b/t/pr87.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/pr9.sh b/t/pr9.sh
index 9a69670c8..35083a293 100644
--- a/t/pr9.sh
+++ b/t/pr9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/precious.sh b/t/precious.sh
index 46d98a90b..13ad5a4c4 100644
--- a/t/precious.sh
+++ b/t/precious.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/prefix.sh b/t/prefix.sh
index d91ea5961..405ef9b5f 100644
--- a/t/prefix.sh
+++ b/t/prefix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/preproc-basics.sh b/t/preproc-basics.sh
index 0bf709b76..5dce7f317 100644
--- a/t/preproc-basics.sh
+++ b/t/preproc-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
index 6caf24c6a..4b42249e9 100644
--- a/t/preproc-c-compile.sh
+++ b/t/preproc-c-compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index c80da39db..8bd65fe48 100644
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index 124a76b9a..c2157b615 100644
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/primary-prefix-couples-documented-valid.sh b/t/primary-prefix-couples-documented-valid.sh
index ff477d0b6..ee8295dbe 100644
--- a/t/primary-prefix-couples-documented-valid.sh
+++ b/t/primary-prefix-couples-documented-valid.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/primary-prefix-couples-force-valid.sh b/t/primary-prefix-couples-force-valid.sh
index 11e5d0481..5e4dc5239 100644
--- a/t/primary-prefix-couples-force-valid.sh
+++ b/t/primary-prefix-couples-force-valid.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
index 98f19a61f..8c43928dd 100644
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/primary-prefix-valid-couples.sh b/t/primary-prefix-valid-couples.sh
index d5c14d903..4058692ed 100644
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/primary.sh b/t/primary.sh
index 0d4027c51..1e406a9be 100644
--- a/t/primary.sh
+++ b/t/primary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/primary2.sh b/t/primary2.sh
index a8b7b4e25..2616f17c0 100644
--- a/t/primary2.sh
+++ b/t/primary2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/primary3.sh b/t/primary3.sh
index 846a33c22..6c1ed7c10 100644
--- a/t/primary3.sh
+++ b/t/primary3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
index e1f6ec7d2..35ce62345 100644
--- a/t/print-libdir.sh
+++ b/t/print-libdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/proginst.sh b/t/proginst.sh
index 13933a73e..6a7a1e050 100644
--- a/t/proginst.sh
+++ b/t/proginst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
index 3b7229626..3601e325b 100644
--- a/t/programs-primary-rewritten.sh
+++ b/t/programs-primary-rewritten.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index 13a22ff1d..b0918a4e9 100644
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
index 5d73b046a..2397c4a37 100644
--- a/t/py-compile-basic.sh
+++ b/t/py-compile-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index 4ceef840a..5a57348d1 100644
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index f6d19bfad..7f6bc92d6 100644
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
index bc378fff0..40bf8a1f9 100644
--- a/t/py-compile-option-terminate.sh
+++ b/t/py-compile-option-terminate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index 1419ae746..2e03cb63b 100644
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
index 937556bde..e1508ead7 100644
--- a/t/python-am-path-iftrue.sh
+++ b/t/python-am-path-iftrue.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/python-dist.sh b/t/python-dist.sh
index 9cbb3bb00..a55968237 100644
--- a/t/python-dist.sh
+++ b/t/python-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/python-missing.sh b/t/python-missing.sh
index 84238f4ab..621aa3283 100644
--- a/t/python-missing.sh
+++ b/t/python-missing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index 85e0d42e2..25d44a776 100644
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/python-prefix.sh b/t/python-prefix.sh
new file mode 100755
index 000000000..3179d42e5
--- /dev/null
+++ b/t/python-prefix.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2021 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+# Test configure options --with-python_prefix and --with-python_exec_prefix.
+# We can't test with no prefixes specified, since the default is to
+# install in Python's sys.prefix and sys.exec_prefix directories.
+
+required=python
+. test-init.sh
+
+cat >>configure.ac <<EOF
+AM_PATH_PYTHON
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<'END'
+# to be installed in pythondir:
+python_PYTHON = one.py
+
+# to be installed in pythonpkgdir:
+pkgpython_PYTHON = pkgtwo.py
+
+one.py:
+ echo 'def one(): return 1' >$@ || rm -f $@
+pkgtwo.py:
+ echo 'def pkgtwo(): return 1' >$@ || rm -f $@
+
+# It's too much trouble to build and install something that actually
+# needs to be under exec_prefix. Instead, we'll just check the value of
+# the variable.
+echo-python-exec-prefix:
+ @echo $(PYTHON_EXEC_PREFIX)
+END
+
+py_version=$(python -c 'import sys; print("%u.%u" % sys.version_info[:2])')
+py_inst_site=inst/lib/python$py_version/site-packages
+py_instexec_site=instexec/lib/python$py_version/site-packages
+
+# First test: if --with-python_prefix is given, by default it should
+# be used for python_exec_prefix too.
+#
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+mkdir build
+cd build
+../configure --with-python_prefix="$(pwd)/inst"
+$MAKE install
+#
+py_installed "$py_inst_site"/one.py
+py_installed "$py_inst_site"/one.pyc
+#
+py_installed "$py_inst_site"/python-prefix/pkgtwo.py
+py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc
+#
+test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/inst"
+
+# Second test: specify different --with-python_prefix
+# and --with-python_exec_prefix values.
+#
+cd ..
+rm -rf build auto4mte.cache
+mkdir build
+cd build
+../configure --with-python_prefix="$(pwd)/inst" \
+ --with-python_exec_prefix="$(pwd)/instexec"
+$MAKE install
+#
+py_installed "$py_inst_site"/one.py
+py_installed "$py_inst_site"/one.pyc
+#
+py_installed "$py_inst_site"/python-prefix/pkgtwo.py
+py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc
+#
+test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/instexec"
+
+:
diff --git a/t/python-too-old.sh b/t/python-too-old.sh
index df9da68f1..e2f6aa5f5 100644
--- a/t/python-too-old.sh
+++ b/t/python-too-old.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/python-vars.sh b/t/python-vars.sh
index b53018b37..9070c7501 100644
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -23,17 +23,17 @@ required=python
# In case the user's config.site defines pythondir or pyexecdir.
CONFIG_SITE=/dev/null; export CONFIG_SITE
-# Update the definition below if the documentation changes.
-# Note that the value of the 'pythondir' and 'pyexecdir' variables can
-# vary among different python installations, so we need more relaxed
-# and ad-hoc checks for them. Also, more proper "functional" checks
-# on them should be done in the 'python-virtualenv.sh' test.
-#
+# Update the definition below if the documentation changes. The values
+# of the 'pythondir' and 'pyexecdir' variables vary among different
+# python installations, so we need more relaxed and ad-hoc checks for
+# them. Also, more proper "functional" checks on them should be done in
+# the 'python-virtualenv.sh' test.
+#
# This version identification is duplicated in python.m4 (and the manual).
-PYTHON_VERSION=$($PYTHON -c 'import sys; print("%u.%u" % sys.version_info[:2])') || exit 1
-PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1
-PYTHON_EXEC_PREFIX='${exec_prefix}'
-PYTHON_PREFIX='${prefix}'
+PYTHON_VERSION=$($PYTHON -c 'import sys; print ("%u.%u" % sys.version_info[:2])') || exit 1
+PYTHON_PLATFORM=$($PYTHON -c 'import sys; print (sys.platform)') || exit 1
+PYTHON_EXEC_PREFIX=$($PYTHON -c 'import sys; print (sys.exec_prefix)') || exit 1
+PYTHON_PREFIX=$($PYTHON -c 'import sys; print (sys.prefix)') || exit 1
pkgpythondir="\${pythondir}/$me"
pkgpyexecdir="\${pyexecdir}/$me"
@@ -62,17 +62,17 @@ check-local: test-in test-am
test-in:
cat pythondir
- case `cat pythondir` in '$${prefix}'/*);; *) exit 1;; esac
+ case `cat pythondir` in '$${PYTHON_PREFIX}'/*);; *) exit 1;; esac
cat pyexecdir
- case `cat pyexecdir` in '$${exec_prefix}'/*);; *) exit 1;; esac
+ case `cat pyexecdir` in '$${PYTHON_EXEC_PREFIX}'/*);; *) exit 1;; esac
cat $(srcdir)/vars-exp
cat $(builddir)/vars-got
diff $(srcdir)/vars-exp $(builddir)/vars-got
## Note: this target's rules will be extended in the "for" loop below.
test-am:
- case '$(pythondir)' in '$(prefix)'/*);; *) exit 1;; esac
- case '$(pyexecdir)' in '$(exec_prefix)'/*);; *) exit 1;; esac
+ case '$(pythondir)' in '$(PYTHON_PREFIX)'/*);; *) exit 1;; esac
+ case '$(pyexecdir)' in '$(PYTHON_EXEC_PREFIX)'/*);; *) exit 1;; esac
END
echo @pythondir@ > pythondir.in
@@ -85,7 +85,7 @@ for var in $pyvars; do
eval val=\$$var
echo "var=$val" >> vars-exp
echo "var=@$var@" >> vars-got.in
- echo "${tab}test x'\$($var)' = x'$val'" >> Makefile.am
+ echo "${tab}test x'\$($var)' = x'$val' || test \"\$NO_CHECK_PYTHON_PREFIX\"" >> Makefile.am
done
cat Makefile.am
@@ -98,10 +98,15 @@ for var in pythondir pyexecdir $pyvars; do
grep "^$var *=" Makefile.in
done
+instdir=$(pwd)/inst
+
$AUTOCONF
-./configure PYTHON="$PYTHON"
+./configure --prefix="$instdir" PYTHON="$PYTHON"
$MAKE test-in test-am
-$MAKE distcheck
+# This tries to install to $PYTHON_PREFIX, which may not be writable.
+# Override it to something safe, but then of course we have to skip
+# checking that it is what we originally set it to.
+run_make distcheck PYTHON_PREFIX="$instdir" NO_CHECK_PYTHON_PREFIX=1
:
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index 05df22b7c..b4a6cd0d3 100644
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -46,7 +46,7 @@ cwd=$(pwd) || fatal_ "getting current working directory"
py_version=$(python -c 'import sys; print("%u.%u" % tuple(sys.version_info[:2]))')
py_site=$VIRTUAL_ENV/lib/python$py_version/site-packages
-# We need to do do this early, just to set some cache variables properly,
+# We need to do this early, just to set some cache variables properly,
# since because we're going to unset $PYTHON next.
if python_has_pep3147; then
: PEP 3147 will be used in installation of ".pyc" files
diff --git a/t/python.sh b/t/python.sh
index 6abc60b65..ab977f5f3 100644
--- a/t/python.sh
+++ b/t/python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/python10.sh b/t/python10.sh
index 683a14b1b..3ad9a4451 100644
--- a/t/python10.sh
+++ b/t/python10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/python11.sh b/t/python11.sh
index 0374de8a2..5d7a984bf 100644
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/python12.sh b/t/python12.sh
index cba49ea61..30963878d 100644
--- a/t/python12.sh
+++ b/t/python12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/python2.sh b/t/python2.sh
index 3f0dbe378..fdd6a42f5 100644
--- a/t/python2.sh
+++ b/t/python2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/python3.sh b/t/python3.sh
index 5658f7f58..c3bd52e54 100644
--- a/t/python3.sh
+++ b/t/python3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/recurs-user-deeply-nested.sh b/t/recurs-user-deeply-nested.sh
index b737b79e0..b004d05a3 100644
--- a/t/recurs-user-deeply-nested.sh
+++ b/t/recurs-user-deeply-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-indir.sh b/t/recurs-user-indir.sh
index aa24eab77..40050b83f 100644
--- a/t/recurs-user-indir.sh
+++ b/t/recurs-user-indir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-keep-going.sh b/t/recurs-user-keep-going.sh
index e0a1352a3..d740149ae 100644
--- a/t/recurs-user-keep-going.sh
+++ b/t/recurs-user-keep-going.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-many.sh b/t/recurs-user-many.sh
index e9f0e1ed3..b3f080faf 100644
--- a/t/recurs-user-many.sh
+++ b/t/recurs-user-many.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-no-subdirs.sh b/t/recurs-user-no-subdirs.sh
index 2ac098c63..4cd034344 100644
--- a/t/recurs-user-no-subdirs.sh
+++ b/t/recurs-user-no-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-no-top-level.sh b/t/recurs-user-no-top-level.sh
index 7cfede7ad..3b45fde40 100644
--- a/t/recurs-user-no-top-level.sh
+++ b/t/recurs-user-no-top-level.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-override.sh b/t/recurs-user-override.sh
index de8de28ec..1f32df706 100644
--- a/t/recurs-user-override.sh
+++ b/t/recurs-user-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-phony.sh b/t/recurs-user-phony.sh
index cabf01fa7..4b6065182 100644
--- a/t/recurs-user-phony.sh
+++ b/t/recurs-user-phony.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user-wrap.sh b/t/recurs-user-wrap.sh
index 5838048d8..ba314c800 100644
--- a/t/recurs-user-wrap.sh
+++ b/t/recurs-user-wrap.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user.sh b/t/recurs-user.sh
index 83fdb1193..6e4236279 100644
--- a/t/recurs-user.sh
+++ b/t/recurs-user.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/recurs-user2.sh b/t/recurs-user2.sh
index b43356577..7cd2a2932 100644
--- a/t/recurs-user2.sh
+++ b/t/recurs-user2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/relativize.tap b/t/relativize.tap
index 3e01bb03d..016f88025 100644
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/remake-aclocal-version-mismatch.sh b/t/remake-aclocal-version-mismatch.sh
index 4b158aa22..da52c6785 100644
--- a/t/remake-aclocal-version-mismatch.sh
+++ b/t/remake-aclocal-version-mismatch.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/remake-after-acinclude-m4.sh b/t/remake-after-acinclude-m4.sh
index 2278d6dec..f2f5b6b04 100644
--- a/t/remake-after-acinclude-m4.sh
+++ b/t/remake-after-acinclude-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
index ce4277f02..5cb95d3d1 100644
--- a/t/remake-after-aclocal-m4.sh
+++ b/t/remake-after-aclocal-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-after-configure-ac.sh b/t/remake-after-configure-ac.sh
index 03d416ce9..fbcc15c2e 100644
--- a/t/remake-after-configure-ac.sh
+++ b/t/remake-after-configure-ac.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
index 585c3020a..ea5d89eae 100644
--- a/t/remake-after-makefile-am.sh
+++ b/t/remake-after-makefile-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index 99982a5a0..28307992a 100644
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-all-2.sh b/t/remake-all-2.sh
index cceb0a2b6..cc8ec21aa 100644
--- a/t/remake-all-2.sh
+++ b/t/remake-all-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
index 2ce9639f0..c7b0e425d 100644
--- a/t/remake-am-pr10111.sh
+++ b/t/remake-am-pr10111.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-config-status-dependencies.sh b/t/remake-config-status-dependencies.sh
index 5a3eae9e7..d6ec955b6 100644
--- a/t/remake-config-status-dependencies.sh
+++ b/t/remake-config-status-dependencies.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/remake-configure-dependencies.sh b/t/remake-configure-dependencies.sh
index 8b35326ea..14c66ca8b 100644
--- a/t/remake-configure-dependencies.sh
+++ b/t/remake-configure-dependencies.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
index 5f092d588..f534052cf 100644
--- a/t/remake-deeply-nested.sh
+++ b/t/remake-deeply-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
index dc3ce4060..f4c17b153 100644
--- a/t/remake-deleted-am-2.sh
+++ b/t/remake-deleted-am-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
index 79ef05686..225ac384a 100644
--- a/t/remake-deleted-am-subdir.sh
+++ b/t/remake-deleted-am-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
index 60abc0d6c..0b7abb180 100644
--- a/t/remake-deleted-am.sh
+++ b/t/remake-deleted-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 28d47d259..2891f9eb0 100644
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-fail.sh b/t/remake-fail.sh
index 77ef16b4e..42097c9ff 100644
--- a/t/remake-fail.sh
+++ b/t/remake-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 528cc2274..c69b99f4b 100644
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 3d42637f5..07f1a200e 100644
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 0eda06719..76aa846da 100644
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-include-aclocal.sh b/t/remake-include-aclocal.sh
index d43b064e8..e3dac25af 100644
--- a/t/remake-include-aclocal.sh
+++ b/t/remake-include-aclocal.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-include-configure.sh b/t/remake-include-configure.sh
index ddfc01f7a..1dc7c2ec5 100644
--- a/t/remake-include-configure.sh
+++ b/t/remake-include-configure.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-include-makefile.sh b/t/remake-include-makefile.sh
index 4419a76e0..7d78778de 100644
--- a/t/remake-include-makefile.sh
+++ b/t/remake-include-makefile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
index 245041a4a..8ef23d83c 100644
--- a/t/remake-m4-pr10111.sh
+++ b/t/remake-m4-pr10111.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
index dc17b23f4..87c12b43a 100644
--- a/t/remake-macrodir.sh
+++ b/t/remake-macrodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/remake-maintainer-mode.sh b/t/remake-maintainer-mode.sh
index 8205b8db8..faaf01d27 100644
--- a/t/remake-maintainer-mode.sh
+++ b/t/remake-maintainer-mode.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/remake-makefile-intree.sh b/t/remake-makefile-intree.sh
index e60707f8b..ca1b1b91d 100644
--- a/t/remake-makefile-intree.sh
+++ b/t/remake-makefile-intree.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-makefile-vpath.sh b/t/remake-makefile-vpath.sh
index 311c8e4a7..8d724387d 100644
--- a/t/remake-makefile-vpath.sh
+++ b/t/remake-makefile-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh
index f445bd30b..682ffc131 100644
--- a/t/remake-mild-stress.sh
+++ b/t/remake-mild-stress.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 090a229a0..50c9b25f6 100644
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-not-after-make-dist.sh b/t/remake-not-after-make-dist.sh
index 96212ae2e..9b05cfbc3 100644
--- a/t/remake-not-after-make-dist.sh
+++ b/t/remake-not-after-make-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/remake-recurs-user.sh b/t/remake-recurs-user.sh
index 6e663a2f4..9a9e1cffc 100644
--- a/t/remake-recurs-user.sh
+++ b/t/remake-recurs-user.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
index f190381cf..68543f935 100644
--- a/t/remake-renamed-am.sh
+++ b/t/remake-renamed-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index c4fb0afe9..d5cbcc8ec 100644
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh
index 3be9223d3..15f0cfd23 100644
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index c8df48e20..c4e3f81d7 100644
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
index c3a5954c5..8f06a0643 100644
--- a/t/remake-subdir-from-subdir.sh
+++ b/t/remake-subdir-from-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
index 8a2bcccc8..b90c775a8 100644
--- a/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
index c698f380b..eb8e09659 100644
--- a/t/remake-subdir-grepping.sh
+++ b/t/remake-subdir-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
index 967d8875a..03cf78570 100644
--- a/t/remake-subdir-long-time.sh
+++ b/t/remake-subdir-long-time.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-subdir-no-makefile.sh b/t/remake-subdir-no-makefile.sh
index 0521ee73f..6c9052f5e 100644
--- a/t/remake-subdir-no-makefile.sh
+++ b/t/remake-subdir-no-makefile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-subdir-only.sh b/t/remake-subdir-only.sh
index b6e848578..94e5d5728 100644
--- a/t/remake-subdir-only.sh
+++ b/t/remake-subdir-only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
index 2de8041aa..b80e94f14 100644
--- a/t/remake-subdir.sh
+++ b/t/remake-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-subdir2.sh b/t/remake-subdir2.sh
index 162ad6ecf..5663ba502 100644
--- a/t/remake-subdir2.sh
+++ b/t/remake-subdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/remake-subdir3.sh b/t/remake-subdir3.sh
index 6801600e6..2535cc287 100644
--- a/t/remake-subdir3.sh
+++ b/t/remake-subdir3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
index 22918868c..1bba8dc14 100644
--- a/t/remake-timing-bug-pr8365.sh
+++ b/t/remake-timing-bug-pr8365.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index 0efccbf35..d572d34ba 100644
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/reqd2.sh b/t/reqd2.sh
index 33a4051b1..b596537d5 100644
--- a/t/reqd2.sh
+++ b/t/reqd2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/rm-f-probe.sh b/t/rm-f-probe.sh
index 59740a165..41f7f03f7 100644
--- a/t/rm-f-probe.sh
+++ b/t/rm-f-probe.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/rulepat.sh b/t/rulepat.sh
index 62497294b..1866e0801 100644
--- a/t/rulepat.sh
+++ b/t/rulepat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/sanity.sh b/t/sanity.sh
index ce142222e..624f726ef 100644
--- a/t/sanity.sh
+++ b/t/sanity.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/seenc.sh b/t/seenc.sh
index 21d6add47..a9ffb5b3b 100644
--- a/t/seenc.sh
+++ b/t/seenc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/self-check-cc-no-c-o.sh b/t/self-check-cc-no-c-o.sh
index 67d8dd224..87787e4b9 100644
--- a/t/self-check-cc-no-c-o.sh
+++ b/t/self-check-cc-no-c-o.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
index e009c0a65..a963cb08d 100644
--- a/t/self-check-configure-help.sh
+++ b/t/self-check-configure-help.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index f22bc551a..fabdaa402 100644
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index 8e9700489..74e363e5b 100644
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index 9ccfdda23..5f683174e 100644
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-is-blocked-signal.tap b/t/self-check-is-blocked-signal.tap
index 8de96496a..bf16d38dc 100644
--- a/t/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 013ae37a8..0e45e1d65 100644
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
index d9c3a66f8..0a4cd8794 100644
--- a/t/self-check-me.tap
+++ b/t/self-check-me.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
index c609d30ab..9d8320c2e 100644
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
index 8d5c4c6aa..9678a1c69 100644
--- a/t/self-check-seq.tap
+++ b/t/self-check-seq.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index 486c1a32b..89d9be2c1 100644
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
index d4f06bfc0..85531f5fc 100644
--- a/t/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index c045da19a..22205a277 100644
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/silent-c.sh b/t/silent-c.sh
index 9521fce7d..8e521b1ce 100644
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
index a1b75eb0b..05765f570 100644
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index be845463b..6f164a67c 100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-cxx.sh b/t/silent-cxx.sh
index ce2e6e8b7..c5fc5f2fb 100644
--- a/t/silent-cxx.sh
+++ b/t/silent-cxx.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/silent-f77.sh b/t/silent-f77.sh
index fe370508f..31bc74710 100644
--- a/t/silent-f77.sh
+++ b/t/silent-f77.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/silent-f90.sh b/t/silent-f90.sh
index 5a0a0e658..2c3b1ef28 100644
--- a/t/silent-f90.sh
+++ b/t/silent-f90.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/silent-gen.sh b/t/silent-gen.sh
index e65e01c1f..135eb83f9 100644
--- a/t/silent-gen.sh
+++ b/t/silent-gen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index cf443847a..edb01b3ca 100644
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index 375579b25..1bc7f4f57 100644
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index 174788cb6..edb59e7c9 100644
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index 5be5de7e9..844890faa 100644
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 97d9ff78c..fede8db03 100644
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index 8acbf57bd..c10fc5cc4 100644
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 936065a52..d11fc2ab2 100644
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/sourcefile-in-subdir.sh b/t/sourcefile-in-subdir.sh
index 35965df3f..1a023e88e 100644
--- a/t/sourcefile-in-subdir.sh
+++ b/t/sourcefile-in-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/space.sh b/t/space.sh
index acf96911a..fa0be8870 100644
--- a/t/space.sh
+++ b/t/space.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index 84eb04b07..987ea5cdd 100644
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/specflg6.sh b/t/specflg6.sh
index 8dab3800a..a6dcb4199 100644
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/specflg7.sh b/t/specflg7.sh
index c1759a29a..62367e7d6 100644
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/specflg8.sh b/t/specflg8.sh
index 32ed2b980..116584acd 100644
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 0073635c4..dcf192544 100644
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/spell.sh b/t/spell.sh
index c5a699531..2d0c4b6e5 100644
--- a/t/spell.sh
+++ b/t/spell.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/spell2.sh b/t/spell2.sh
index dcccc7e1b..7bf17438a 100644
--- a/t/spell2.sh
+++ b/t/spell2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/spell3.sh b/t/spell3.sh
index 74e7ac2f4..081a5143e 100644
--- a/t/spell3.sh
+++ b/t/spell3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/spelling.sh b/t/spelling.sh
index 857e12e93..46468ca03 100644
--- a/t/spelling.sh
+++ b/t/spelling.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/spy-double-colon.sh b/t/spy-double-colon.sh
index 26171ec58..aa9f69140 100644
--- a/t/spy-double-colon.sh
+++ b/t/spy-double-colon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index 0c82ddf03..ae6c3f19d 100644
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
index 55b8dea07..cea222b72 100644
--- a/t/src-acsubst.sh
+++ b/t/src-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 420bb42bb..bcb594e8b 100644
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/stdinc.sh b/t/stdinc.sh
index eaab4a372..f7178860a 100644
--- a/t/stdinc.sh
+++ b/t/stdinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2020 Free Software Foundation, Inc.
+# Copyright (C) 2007-2021 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
diff --git a/t/stdlib.sh b/t/stdlib.sh
index 9b847a6fc..5fa7c3092 100644
--- a/t/stdlib.sh
+++ b/t/stdlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
index 3dec30c89..0fbd0eb8e 100644
--- a/t/stdlib2.sh
+++ b/t/stdlib2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
index a6c975f4a..9de15c5a3 100644
--- a/t/strictness-override.sh
+++ b/t/strictness-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
index e5891d65f..db4543cdc 100644
--- a/t/strictness-precedence.sh
+++ b/t/strictness-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/strip.sh b/t/strip.sh
index 9a79de3a5..98d02659c 100644
--- a/t/strip.sh
+++ b/t/strip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/strip2.sh b/t/strip2.sh
index cefaf93c2..86c015650 100644
--- a/t/strip2.sh
+++ b/t/strip2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/strip3.sh b/t/strip3.sh
index 42eae0367..1205de29a 100644
--- a/t/strip3.sh
+++ b/t/strip3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/subdir-ac-subst.sh b/t/subdir-ac-subst.sh
index 646c32ef1..df8baa2af 100644
--- a/t/subdir-ac-subst.sh
+++ b/t/subdir-ac-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subdir-add-pr46.sh b/t/subdir-add-pr46.sh
index d38794831..5758f44d2 100644
--- a/t/subdir-add-pr46.sh
+++ b/t/subdir-add-pr46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index f76a82997..94c59c09e 100644
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh
index 63bd55be5..6329210cc 100644
--- a/t/subdir-am-cond.sh
+++ b/t/subdir-am-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subdir-cond-err.sh b/t/subdir-cond-err.sh
index 0c76fb971..89df08e6a 100644
--- a/t/subdir-cond-err.sh
+++ b/t/subdir-cond-err.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh
index c807cc827..eb3655b62 100644
--- a/t/subdir-cond-gettext.sh
+++ b/t/subdir-cond-gettext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subdir-distclean.sh b/t/subdir-distclean.sh
index 9b8f3a33b..31cbe4e27 100644
--- a/t/subdir-distclean.sh
+++ b/t/subdir-distclean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/subdir-env-interference.sh b/t/subdir-env-interference.sh
index 33e8133ac..3d3b2b6f0 100644
--- a/t/subdir-env-interference.sh
+++ b/t/subdir-env-interference.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/subdir-keep-going-pr12554.sh b/t/subdir-keep-going-pr12554.sh
index 019fcbe99..fe6166349 100644
--- a/t/subdir-keep-going-pr12554.sh
+++ b/t/subdir-keep-going-pr12554.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
index 477f408ee..1a45a0f79 100644
--- a/t/subdir-order.sh
+++ b/t/subdir-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/subdir-subsub.sh b/t/subdir-subsub.sh
index 5c5e988a9..b353db639 100644
--- a/t/subdir-subsub.sh
+++ b/t/subdir-subsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/subdir-with-slash.sh b/t/subdir-with-slash.sh
index 171424951..2421660ac 100644
--- a/t/subdir-with-slash.sh
+++ b/t/subdir-with-slash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/subdir.sh b/t/subdir.sh
index 4ade4a682..1dd30fd1f 100644
--- a/t/subdir.sh
+++ b/t/subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index a0676d3c5..7e5cc7e9b 100644
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index 4516333e5..4d0958c9c 100644
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/subobj-indir-pr13928.sh b/t/subobj-indir-pr13928.sh
index 3de8380ad..93a7ba7d1 100644
--- a/t/subobj-indir-pr13928.sh
+++ b/t/subobj-indir-pr13928.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/subobj-objname-clash.sh b/t/subobj-objname-clash.sh
index c137f3a0b..2a61640fc 100644
--- a/t/subobj-objname-clash.sh
+++ b/t/subobj-objname-clash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/subobj-pr13928-more-langs.sh b/t/subobj-pr13928-more-langs.sh
index cd342b5e3..517509c7b 100644
--- a/t/subobj-pr13928-more-langs.sh
+++ b/t/subobj-pr13928-more-langs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2015-2021 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
diff --git a/t/subobj-vpath-pr13928.sh b/t/subobj-vpath-pr13928.sh
index c3bce9f5b..f873c5817 100644
--- a/t/subobj-vpath-pr13928.sh
+++ b/t/subobj-vpath-pr13928.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/subobj.sh b/t/subobj.sh
index b958fc68e..b883deae2 100644
--- a/t/subobj.sh
+++ b/t/subobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
@@ -50,8 +50,8 @@ grep "option 'subdir-objects' is disabled" stderr
# Verbose tips should be given, but not too many times.
for msg in \
"possible forward-incompatibility" \
+ "For now,.* corresponding" \
"advi[sc]e.* 'subdir-objects' option throughout" \
- "unconditionally.* object file.* same subdirectory" \
; do
test $(grep -c "$msg" stderr) -eq 1
done
diff --git a/t/subobj10.sh b/t/subobj10.sh
index a3823deba..6f2290379 100644
--- a/t/subobj10.sh
+++ b/t/subobj10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 91ed097da..e9f980acb 100644
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
index d786bfb82..ee63680a8 100644
--- a/t/subobj11b.sh
+++ b/t/subobj11b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
index ca131589e..e9a01455c 100644
--- a/t/subobj11c.sh
+++ b/t/subobj11c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/subobj2.sh b/t/subobj2.sh
index 00206b624..238030d0c 100644
--- a/t/subobj2.sh
+++ b/t/subobj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/subobj4.sh b/t/subobj4.sh
index 0af583611..4ad9b7492 100644
--- a/t/subobj4.sh
+++ b/t/subobj4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subobj5.sh b/t/subobj5.sh
index 4c167fd87..14ae2ff21 100644
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subobj6.sh b/t/subobj6.sh
index 89e4959a7..3bccdd10c 100644
--- a/t/subobj6.sh
+++ b/t/subobj6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subobj7.sh b/t/subobj7.sh
index 3d956688d..c226a354c 100644
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subobj8.sh b/t/subobj8.sh
index 19a495993..87b747ddb 100644
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subobj9.sh b/t/subobj9.sh
index 1b3ecd9fd..1fc2830a6 100644
--- a/t/subobj9.sh
+++ b/t/subobj9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subobjname.sh b/t/subobjname.sh
index 967cf84a1..8dfdc309c 100644
--- a/t/subobjname.sh
+++ b/t/subobjname.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
index 0433b8b3f..f732c72a5 100644
--- a/t/subpkg-macrodir.sh
+++ b/t/subpkg-macrodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index 27f262297..eac56cb1f 100644
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subpkg.sh b/t/subpkg.sh
index 35ac1cca8..e54d157f1 100644
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
index 493f1d48d..b68a06e7b 100644
--- a/t/subpkg2.sh
+++ b/t/subpkg2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
index 080a8804d..efd2c0a32 100644
--- a/t/subpkg3.sh
+++ b/t/subpkg3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
index 1bd8acbd2..cd14a7302 100644
--- a/t/subpkg4.sh
+++ b/t/subpkg4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/subst-no-trailing-empty-line.sh b/t/subst-no-trailing-empty-line.sh
index fcff3b359..164163b17 100644
--- a/t/subst-no-trailing-empty-line.sh
+++ b/t/subst-no-trailing-empty-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/subst.sh b/t/subst.sh
index aec4b35e4..253089110 100644
--- a/t/subst.sh
+++ b/t/subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/subst3.sh b/t/subst3.sh
index 6187bcdf8..ef3d0a038 100644
--- a/t/subst3.sh
+++ b/t/subst3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/subst4.sh b/t/subst4.sh
index 80dcf1899..2628b2e92 100644
--- a/t/subst4.sh
+++ b/t/subst4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/subst5.sh b/t/subst5.sh
index 79d8e7c22..f6cecb56b 100644
--- a/t/subst5.sh
+++ b/t/subst5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/substre2.sh b/t/substre2.sh
index e5f302427..f929ac30f 100644
--- a/t/substre2.sh
+++ b/t/substre2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/substref.sh b/t/substref.sh
index 890792529..ed839fe42 100644
--- a/t/substref.sh
+++ b/t/substref.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/substtarg.sh b/t/substtarg.sh
index 72502b2fd..d301dd2af 100644
--- a/t/substtarg.sh
+++ b/t/substtarg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix-chain.tap b/t/suffix-chain.tap
index 3e6cf4774..e045992f7 100644
--- a/t/suffix-chain.tap
+++ b/t/suffix-chain.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix-custom-pr14441.sh b/t/suffix-custom-pr14441.sh
index 5bd080a65..1d8490621 100644
--- a/t/suffix-custom-pr14441.sh
+++ b/t/suffix-custom-pr14441.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix-custom-subobj-and-specflg.sh b/t/suffix-custom-subobj-and-specflg.sh
index ca91b6f9a..4d2df62ad 100644
--- a/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
index 804bc12a9..c2b8339c0 100644
--- a/t/suffix-custom-subobj.sh
+++ b/t/suffix-custom-subobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix-extra-c-stuff-pr14560.sh b/t/suffix-extra-c-stuff-pr14560.sh
index 71f26bcf4..173d17490 100644
--- a/t/suffix-extra-c-stuff-pr14560.sh
+++ b/t/suffix-extra-c-stuff-pr14560.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/suffix.sh b/t/suffix.sh
index c7bc75f17..6b2ffbe6e 100644
--- a/t/suffix.sh
+++ b/t/suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/suffix10.tap b/t/suffix10.tap
index e7d2f8407..2258120e7 100644
--- a/t/suffix10.tap
+++ b/t/suffix10.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix11.tap b/t/suffix11.tap
index e12427b43..4db5c5644 100644
--- a/t/suffix11.tap
+++ b/t/suffix11.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix2.sh b/t/suffix2.sh
index 62b479408..37dc7012e 100644
--- a/t/suffix2.sh
+++ b/t/suffix2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/suffix3.tap b/t/suffix3.tap
index ab91795e0..81f41fa70 100644
--- a/t/suffix3.tap
+++ b/t/suffix3.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/suffix4.sh b/t/suffix4.sh
index 5e036e043..0e9b29599 100644
--- a/t/suffix4.sh
+++ b/t/suffix4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix5.sh b/t/suffix5.sh
index 312aa5468..02a5c38bb 100644
--- a/t/suffix5.sh
+++ b/t/suffix5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix6.sh b/t/suffix6.sh
index 166223ab0..d5069e8a5 100644
--- a/t/suffix6.sh
+++ b/t/suffix6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix6b.sh b/t/suffix6b.sh
index 73d0f541b..a8b6ee6b1 100644
--- a/t/suffix6b.sh
+++ b/t/suffix6b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix6c.sh b/t/suffix6c.sh
index de9ba93ad..6ff9643c2 100644
--- a/t/suffix6c.sh
+++ b/t/suffix6c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix7.sh b/t/suffix7.sh
index 5d990b2f7..a1673878e 100644
--- a/t/suffix7.sh
+++ b/t/suffix7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/suffix8.tap b/t/suffix8.tap
index d206490d5..05ae4ee5f 100644
--- a/t/suffix8.tap
+++ b/t/suffix8.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/suffix9.sh b/t/suffix9.sh
index e714838a8..c10c5680a 100644
--- a/t/suffix9.sh
+++ b/t/suffix9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/symlink.sh b/t/symlink.sh
index 428d41af1..c4e6f6501 100644
--- a/t/symlink.sh
+++ b/t/symlink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/symlink2.sh b/t/symlink2.sh
index 46b6e6270..6f4ac1b9c 100644
--- a/t/symlink2.sh
+++ b/t/symlink2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/syntax.sh b/t/syntax.sh
index 742d18c74..74d601f56 100644
--- a/t/syntax.sh
+++ b/t/syntax.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/tags-lisp-space.sh b/t/tags-lisp-space.sh
index 44312b0b7..2896b7108 100755
--- a/t/tags-lisp-space.sh
+++ b/t/tags-lisp-space.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2019-2020 Free Software Foundation, Inc.
+# Copyright (C) 2019-2021 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
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
index a86cf625c..22b6ee806 100644
--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/tags.sh b/t/tags.sh
index bd1ebb305..0c4373596 100644
--- a/t/tags.sh
+++ b/t/tags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/tags2.sh b/t/tags2.sh
index 5b77ec7d4..42970b52c 100644
--- a/t/tags2.sh
+++ b/t/tags2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/tagsub.sh b/t/tagsub.sh
index bda1cd8b4..f85f7e593 100644
--- a/t/tagsub.sh
+++ b/t/tagsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
index 1b924cfd2..2b43616aa 100644
--- a/t/tap-ambiguous-directive.sh
+++ b/t/tap-ambiguous-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
index 8ef8400d3..55089b19e 100644
--- a/t/tap-autonumber.sh
+++ b/t/tap-autonumber.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
index d28940675..f62351983 100644
--- a/t/tap-bad-prog.tap
+++ b/t/tap-bad-prog.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
index 17a4999b9..6d4f0f038 100644
--- a/t/tap-bailout-and-logging.sh
+++ b/t/tap-bailout-and-logging.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
index 815d38ad4..db635dd3b 100644
--- a/t/tap-bailout-leading-space.sh
+++ b/t/tap-bailout-leading-space.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh
index c6e2d2f8b..7c78b06e5 100644
--- a/t/tap-bailout-suppress-badexit.sh
+++ b/t/tap-bailout-suppress-badexit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh b/t/tap-bailout-suppress-later-diagnostic.sh
index 0b0ecf1bd..b9d5f232f 100644
--- a/t/tap-bailout-suppress-later-diagnostic.sh
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout-suppress-later-errors.sh b/t/tap-bailout-suppress-later-errors.sh
index 2634f246c..076449181 100644
--- a/t/tap-bailout-suppress-later-errors.sh
+++ b/t/tap-bailout-suppress-later-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
index 46956ed76..5d7c8a65a 100644
--- a/t/tap-bailout.sh
+++ b/t/tap-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
index 11f311898..51e907318 100644
--- a/t/tap-basic.sh
+++ b/t/tap-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-color.sh b/t/tap-color.sh
index 801867667..a39ace14a 100644
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
index b0b80a11d..df89ce381 100644
--- a/t/tap-common-setup.sh
+++ b/t/tap-common-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 1cb4c7b55..9169fe09c 100644
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
index 89c4bb53b..592e64071 100644
--- a/t/tap-diagnostic-custom.sh
+++ b/t/tap-diagnostic-custom.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
index ab6493879..62cd325ec 100644
--- a/t/tap-diagnostic.sh
+++ b/t/tap-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
index c8977a263..ad3f69ce1 100644
--- a/t/tap-doc.sh
+++ b/t/tap-doc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index 77a48640a..d4a17e3e7 100644
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
index 1a19f2e6d..f84a2b2cd 100644
--- a/t/tap-driver-stderr.sh
+++ b/t/tap-driver-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
index ba609665d..7cc527b79 100644
--- a/t/tap-empty-diagnostic.sh
+++ b/t/tap-empty-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
index 8c1383731..c7eb13027 100644
--- a/t/tap-empty.sh
+++ b/t/tap-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
index 3e5ae0d3b..70afbb193 100644
--- a/t/tap-escape-directive-2.sh
+++ b/t/tap-escape-directive-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
index a41cc05f1..27651a07f 100644
--- a/t/tap-escape-directive.sh
+++ b/t/tap-escape-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
index a7a8431fa..326db1d4e 100644
--- a/t/tap-exit.sh
+++ b/t/tap-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
index cfbed6a2c..afe549ad6 100644
--- a/t/tap-fancy.sh
+++ b/t/tap-fancy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
index c7533a51d..3b81b816e 100644
--- a/t/tap-fancy2.sh
+++ b/t/tap-fancy2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
index d90eac56a..a706e0419 100644
--- a/t/tap-global-log.sh
+++ b/t/tap-global-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
index 927fcdaec..74fff6e58 100644
--- a/t/tap-global-result.sh
+++ b/t/tap-global-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-log.sh b/t/tap-log.sh
index 5b9476414..f29d5b719 100644
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
index 5747d9559..1d900ee2e 100644
--- a/t/tap-merge-stdout-stderr.sh
+++ b/t/tap-merge-stdout-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-missing-plan-and-bad-exit.sh b/t/tap-missing-plan-and-bad-exit.sh
index 3ec5bb0fa..69774a7b7 100644
--- a/t/tap-missing-plan-and-bad-exit.sh
+++ b/t/tap-missing-plan-and-bad-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-more.sh b/t/tap-more.sh
index ac33cebf8..8fbaf31e4 100644
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
index 9b9e346fd..5a9745257 100644
--- a/t/tap-more2.sh
+++ b/t/tap-more2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
index 7cd4b613d..eaee97d0c 100644
--- a/t/tap-msg0-bailout.sh
+++ b/t/tap-msg0-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
index 7db2fdfa0..c1ff3ce0f 100644
--- a/t/tap-msg0-directive.sh
+++ b/t/tap-msg0-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
index 9967120ab..26522132d 100644
--- a/t/tap-msg0-misc.sh
+++ b/t/tap-msg0-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
index feac701e0..cb03deed0 100644
--- a/t/tap-msg0-planskip.sh
+++ b/t/tap-msg0-planskip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
index d45f67215..93cabc3db 100644
--- a/t/tap-msg0-result.sh
+++ b/t/tap-msg0-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
index da49b3f8b..537f5a60c 100644
--- a/t/tap-negative-numbers.sh
+++ b/t/tap-negative-numbers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
index a8379d6e9..8128d881d 100644
--- a/t/tap-no-disable-hard-error.sh
+++ b/t/tap-no-disable-hard-error.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index 519ae4922..12a75d982 100644
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 74c340093..c0a486aa0 100644
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
index 6a0dd51a2..3aa9e0d9d 100644
--- a/t/tap-no-spurious-summary.sh
+++ b/t/tap-no-spurious-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
index 5d5abfce0..97193be04 100644
--- a/t/tap-no-spurious.sh
+++ b/t/tap-no-spurious.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
index 06a585788..836752294 100644
--- a/t/tap-not-ok-skip.sh
+++ b/t/tap-not-ok-skip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
index b0fc51890..6516cd390 100644
--- a/t/tap-number-wordboundary.sh
+++ b/t/tap-number-wordboundary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
index 56daa93f2..d2461e414 100644
--- a/t/tap-numbers-leading-zero.sh
+++ b/t/tap-numbers-leading-zero.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
index 05414d3f0..f96c60570 100644
--- a/t/tap-numeric-description.sh
+++ b/t/tap-numeric-description.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
index f14708d6b..d28ed4c85 100644
--- a/t/tap-out-of-order.sh
+++ b/t/tap-out-of-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
index 03ba6174a..ca75eadb3 100644
--- a/t/tap-passthrough-exit.sh
+++ b/t/tap-passthrough-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
index f8d9b068e..571dde981 100644
--- a/t/tap-passthrough.sh
+++ b/t/tap-passthrough.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
index ea1604972..050e65cb0 100644
--- a/t/tap-plan-corner.sh
+++ b/t/tap-plan-corner.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
index 91374313d..3ad0bb164 100644
--- a/t/tap-plan-errors.sh
+++ b/t/tap-plan-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index 7f06ddca1..d3f21a224 100644
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index ab0cf05e5..f6f6ece20 100644
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
index 13f892613..6d0d56a66 100644
--- a/t/tap-plan-middle.sh
+++ b/t/tap-plan-middle.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
index 08b7110b3..0eed018cd 100644
--- a/t/tap-plan-whitespace.sh
+++ b/t/tap-plan-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
index 359783d58..d0cace71e 100644
--- a/t/tap-plan.sh
+++ b/t/tap-plan.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index 7ee24fa39..5fb7c83a8 100644
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
index 3b234ddd4..2abb59fa8 100644
--- a/t/tap-planskip-badexit.sh
+++ b/t/tap-planskip-badexit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
index 8f7e06801..f0efe718e 100644
--- a/t/tap-planskip-bailout.sh
+++ b/t/tap-planskip-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-case-insensitive.sh b/t/tap-planskip-case-insensitive.sh
index f3561e5a0..a4a1a1ddd 100644
--- a/t/tap-planskip-case-insensitive.sh
+++ b/t/tap-planskip-case-insensitive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
index 9c34fb9ea..3a6cb92d7 100644
--- a/t/tap-planskip-late.sh
+++ b/t/tap-planskip-late.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
index c4b98dec7..08d709493 100644
--- a/t/tap-planskip-later-errors.sh
+++ b/t/tap-planskip-later-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-unplanned-corner.sh b/t/tap-planskip-unplanned-corner.sh
index 217094c62..ba482509c 100644
--- a/t/tap-planskip-unplanned-corner.sh
+++ b/t/tap-planskip-unplanned-corner.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
index 71cd5769c..b0248a9b8 100644
--- a/t/tap-planskip-unplanned.sh
+++ b/t/tap-planskip-unplanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
index 98e68012a..76b3e59d8 100644
--- a/t/tap-planskip-whitespace.sh
+++ b/t/tap-planskip-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
index f5b10a22a..1816cfc64 100644
--- a/t/tap-planskip.sh
+++ b/t/tap-planskip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh
index 0c0a904a6..fc9a6bfc0 100644
--- a/t/tap-recheck-logs.sh
+++ b/t/tap-recheck-logs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
index d84464da6..fa9a51388 100644
--- a/t/tap-recheck.sh
+++ b/t/tap-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
index 86289992c..01fc72f98 100644
--- a/t/tap-result-comment.sh
+++ b/t/tap-result-comment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
index 6335c4332..bf7ee401a 100644
--- a/t/tap-signal.tap
+++ b/t/tap-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
index 232a1490f..b1081263b 100644
--- a/t/tap-summary-color.sh
+++ b/t/tap-summary-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
index 244d4e0df..0dc4afae5 100644
--- a/t/tap-summary.sh
+++ b/t/tap-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index a43984501..9e9fbf4db 100644
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
index 06bac3190..3fd7b38f5 100644
--- a/t/tap-todo-skip-together.sh
+++ b/t/tap-todo-skip-together.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
index 41d2b3c0e..e5d96f452 100644
--- a/t/tap-todo-skip-whitespace.sh
+++ b/t/tap-todo-skip-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index 501d08a65..be6f69c04 100644
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
index 6f2471236..4ceae5bb8 100644
--- a/t/tap-unplanned.sh
+++ b/t/tap-unplanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-whitespace-normalization.sh b/t/tap-whitespace-normalization.sh
index 9ca383c35..cef342f8f 100644
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
index 68670c242..3c732ab7a 100644
--- a/t/tap-with-and-without-number.sh
+++ b/t/tap-with-and-without-number.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
index 43915f978..55914619c 100644
--- a/t/tap-xfail-tests.sh
+++ b/t/tap-xfail-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tar-opts-errors.sh b/t/tar-opts-errors.sh
index 8e141bd96..dd93fbe1e 100644
--- a/t/tar-opts-errors.sh
+++ b/t/tar-opts-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/tar-override.sh b/t/tar-override.sh
index c836da159..2c081d918 100644
--- a/t/tar-override.sh
+++ b/t/tar-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tar-pax.sh b/t/tar-pax.sh
index 90a311d11..f6d9eda40 100644
--- a/t/tar-pax.sh
+++ b/t/tar-pax.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/tar-ustar-id-too-high.sh b/t/tar-ustar-id-too-high.sh
index 78addbf00..ba16a2b6f 100644
--- a/t/tar-ustar-id-too-high.sh
+++ b/t/tar-ustar-id-too-high.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/tar-ustar.sh b/t/tar-ustar.sh
index e3152d4c3..63dacc1f0 100644
--- a/t/tar-ustar.sh
+++ b/t/tar-ustar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index ccd2e58ca..725c32b75 100644
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/t/targetclash.sh b/t/targetclash.sh
index ccb64e179..8f04a071b 100644
--- a/t/targetclash.sh
+++ b/t/targetclash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index abe53c4ee..a5beb7ed5 100644
--- a/t/test-driver-acsubst.sh
+++ b/t/test-driver-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
index 1a36e2e1e..0073b8a30 100644
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
index 54c904ef7..ec3f28f99 100644
--- a/t/test-driver-create-log-dir.sh
+++ b/t/test-driver-create-log-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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,13 @@ check-local: $(TEST_SUITE_LOG)
test -f sub/foo.trs
test -f sub/subsub/bar.trs
test -f sub1/baz.trs
+
+# Tell GNU make not to parallelize, since the two tests under sub/
+# can result in, for example:
+# fatal: making test-suite.log: failed to create sub/foo.trs
+# fatal: making test-suite.log: failed to create sub/foo.log
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
echo "#!$AM_TEST_RUNNER_SHELL" > checkdir-driver
diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh
index 640ba0e66..ce6635bfa 100644
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh
index f2cba5757..cca96f766 100644
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh
index 457f53a98..df5813a1a 100644
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-custom-no-extra-driver.sh b/t/test-driver-custom-no-extra-driver.sh
index 50025c2d3..163a9a6a8 100644
--- a/t/test-driver-custom-no-extra-driver.sh
+++ b/t/test-driver-custom-no-extra-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh
index 116574168..9d78892ea 100644
--- a/t/test-driver-custom-xfail-tests.sh
+++ b/t/test-driver-custom-xfail-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
index 926b3dd53..68c16b3fd 100644
--- a/t/test-driver-custom.sh
+++ b/t/test-driver-custom.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
index 5648e7f22..4c8e27f1c 100644
--- a/t/test-driver-fail.sh
+++ b/t/test-driver-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
index fa1bf3c0a..5cdf3dfa7 100644
--- a/t/test-driver-is-distributed.sh
+++ b/t/test-driver-is-distributed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
index 9acb24e0e..a5790cb71 100644
--- a/t/test-driver-strip-vpath.sh
+++ b/t/test-driver-strip-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-driver-trs-suffix-registered.sh b/t/test-driver-trs-suffix-registered.sh
index 61521880a..7fb92a3fb 100644
--- a/t/test-driver-trs-suffix-registered.sh
+++ b/t/test-driver-trs-suffix-registered.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
index c8a8e2fb0..e56c99ec5 100644
--- a/t/test-extensions-cond.sh
+++ b/t/test-extensions-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-extensions-empty.sh b/t/test-extensions-empty.sh
index 5f466e0da..915bf5c9b 100755
--- a/t/test-extensions-empty.sh
+++ b/t/test-extensions-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2020-2021 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
diff --git a/t/test-extensions.sh b/t/test-extensions.sh
index 2ccc5c559..5618d77fd 100644
--- a/t/test-extensions.sh
+++ b/t/test-extensions.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
index ad2963f55..6a402ec90 100644
--- a/t/test-harness-vpath-rewrite.sh
+++ b/t/test-harness-vpath-rewrite.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/test-log.sh b/t/test-log.sh
index 48165a6e5..32f4e8442 100644
--- a/t/test-log.sh
+++ b/t/test-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
index f72742193..9f0bb3938 100644
--- a/t/test-logs-repeated.sh
+++ b/t/test-logs-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
index 07b492cb2..6468c8bcb 100644
--- a/t/test-metadata-global-log.sh
+++ b/t/test-metadata-global-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
index cceec7d7c..d0f06bbda 100644
--- a/t/test-metadata-global-result.sh
+++ b/t/test-metadata-global-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
index 662810fa4..7d0f40c34 100644
--- a/t/test-metadata-recheck.sh
+++ b/t/test-metadata-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
index 28d737b59..a36c39447 100644
--- a/t/test-metadata-results.sh
+++ b/t/test-metadata-results.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-missing.sh b/t/test-missing.sh
index a62777d84..8018ea497 100644
--- a/t/test-missing.sh
+++ b/t/test-missing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-missing2.sh b/t/test-missing2.sh
index 4b30f3502..fcc3dbc0c 100644
--- a/t/test-missing2.sh
+++ b/t/test-missing2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index 7b4dc7b19..3eb6784b0 100644
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index 285602eb4..77e97efa6 100644
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/test-trs-recover2.sh b/t/test-trs-recover2.sh
index e138e23c5..3729ad3b3 100644
--- a/t/test-trs-recover2.sh
+++ b/t/test-trs-recover2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tests-environment-and-log-compiler.sh b/t/tests-environment-and-log-compiler.sh
index c0aceda3c..c4a983b3c 100644
--- a/t/tests-environment-and-log-compiler.sh
+++ b/t/tests-environment-and-log-compiler.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tests-environment-backcompat.sh b/t/tests-environment-backcompat.sh
index 0deff574c..be9acf038 100644
--- a/t/tests-environment-backcompat.sh
+++ b/t/tests-environment-backcompat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/tests-environment-fd-redirect.sh b/t/tests-environment-fd-redirect.sh
index e7159c791..8c1f26f55 100644
--- a/t/tests-environment-fd-redirect.sh
+++ b/t/tests-environment-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -70,6 +70,15 @@ case $SHELL in
esac
for sh in "$SHELL" "$bin_ksh"; do
+
+ # The following hangs with Fedora 34's ksh-20120801-255:
+ # (seq --format=z%g= 121; echo "eval ': \`(set) 2>&1\`'")|env -i ksh
+ # yet terminates if it emits one fewer variable assignment.
+ # Using that ksh here would make this test hang: the above is
+ # derived from the configure script generated for this test.
+ # Reported as https://github.com/ksh93/ksh/issues/316
+ case $sh in */ksh) skip_ "skipping $sh to avoid hang"; continue;; esac
+
test "$sh" = : && continue
for pfx in AM_ ''; do
unindent > Makefile.am <<END
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
index 8ceaa0820..1585fccbc 100644
--- a/t/tests-environment.sh
+++ b/t/tests-environment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index 3001f46cf..f3852c484 100644
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/testsuite-summary-count-many.sh b/t/testsuite-summary-count-many.sh
index f5ed3801e..093d2f226 100644
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index 519dee382..e46350266 100644
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/testsuite-summary-header.sh b/t/testsuite-summary-header.sh
index f1940860d..386ce86e1 100644
--- a/t/testsuite-summary-header.sh
+++ b/t/testsuite-summary-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/testsuite-summary-reference-log.sh b/t/testsuite-summary-reference-log.sh
index 1debb5b8f..ffa95641d 100644
--- a/t/testsuite-summary-reference-log.sh
+++ b/t/testsuite-summary-reference-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/toplevelmd.sh b/t/toplevelmd.sh
new file mode 100644
index 000000000..f93f920e4
--- /dev/null
+++ b/t/toplevelmd.sh
@@ -0,0 +1,67 @@
+#! /bin/sh
+# Copyright (C) 2003-2021 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+# Check that the top-level files (INSTALL, NEWS, README-alpha, etc.)
+# can be .md, or not. (Based on alpha2.sh.)
+
+. test-init.sh
+
+cat > configure.ac << 'END'
+AC_INIT([alpha], [1.0b])
+AM_INIT_AUTOMAKE([readme-alpha])
+AC_CONFIG_FILES([Makefile sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+check-local: distdir
+ for f in AUTHORS ChangeLog INSTALL NEWS README THANKS; do \
+ test -f $(distdir)/$$f.md; done
+ test -f $(distdir)/COPYING
+ test -f $(distdir)/README-alpha.md
+ test ! -f $(distdir)/sub/README.md
+ test ! -f $(distdir)/sub/README-alpha.md # not distributed
+ : > works
+END
+
+mkdir sub
+: > sub/Makefile.am
+
+# do both md and non-md.
+: > README-alpha.md
+: > sub/README-alpha.md
+: > sub/README
+
+# top level
+: > AUTHORS.md
+: > ChangeLog.md
+: > INSTALL.md
+: > NEWS.md
+: > README.md
+: > THANKS.md
+
+# not md
+: > COPYING
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE check
+test -f works
+
diff --git a/t/transform.sh b/t/transform.sh
index bcf47d3bb..7a17d9a57 100644
--- a/t/transform.sh
+++ b/t/transform.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/transform2.sh b/t/transform2.sh
index f758b15da..bc875b178 100644
--- a/t/transform2.sh
+++ b/t/transform2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
@@ -45,6 +45,10 @@ test-install-foo: install
test ! -f inst/bin/s2.sh
test ! -f inst/man/man/m1.1
test ! -f inst/man/man/m2.1
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
EOF
cat >p1.c <<'EOF'
diff --git a/t/transform3.sh b/t/transform3.sh
index eb6ac3ae5..9e2c97080 100644
--- a/t/transform3.sh
+++ b/t/transform3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/txinfo-absolute-srcdir-pr408.sh b/t/txinfo-absolute-srcdir-pr408.sh
index 814dc6696..c96d64333 100644
--- a/t/txinfo-absolute-srcdir-pr408.sh
+++ b/t/txinfo-absolute-srcdir-pr408.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-add-missing-and-dist.sh b/t/txinfo-add-missing-and-dist.sh
index 6c15bb05a..7c4d5c8f3 100644
--- a/t/txinfo-add-missing-and-dist.sh
+++ b/t/txinfo-add-missing-and-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
diff --git a/t/txinfo-bsd-make-recurs.sh b/t/txinfo-bsd-make-recurs.sh
index 0b1fc4b5b..8618f63ef 100644
--- a/t/txinfo-bsd-make-recurs.sh
+++ b/t/txinfo-bsd-make-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
diff --git a/t/txinfo-builddir.sh b/t/txinfo-builddir.sh
index 6b7d405f6..895f875ca 100644
--- a/t/txinfo-builddir.sh
+++ b/t/txinfo-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/txinfo-clean.sh b/t/txinfo-clean.sh
index e6beb19db..82babacec 100644
--- a/t/txinfo-clean.sh
+++ b/t/txinfo-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-dvi-recurs.sh b/t/txinfo-dvi-recurs.sh
index 458d028d8..615f17984 100644
--- a/t/txinfo-dvi-recurs.sh
+++ b/t/txinfo-dvi-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index 084522b68..c359cd49d 100644
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/txinfo-info-in-srcdir.sh b/t/txinfo-info-in-srcdir.sh
index b63319d0b..e1c8b9772 100644
--- a/t/txinfo-info-in-srcdir.sh
+++ b/t/txinfo-info-in-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh b/t/txinfo-makeinfo-error-no-clobber.sh
index 9d8fa0161..0776ad365 100644
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-many-output-formats-vpath.sh b/t/txinfo-many-output-formats-vpath.sh
index 46907bbc8..dbffee425 100644
--- a/t/txinfo-many-output-formats-vpath.sh
+++ b/t/txinfo-many-output-formats-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh
index 3096a906f..db648d362 100644
--- a/t/txinfo-many-output-formats.sh
+++ b/t/txinfo-many-output-formats.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index 6940aa945..3687776f9 100644
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/txinfo-no-extra-dist.sh b/t/txinfo-no-extra-dist.sh
index 8746200ad..ecb458511 100644
--- a/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/txinfo-no-installinfo.sh b/t/txinfo-no-installinfo.sh
index 023e4717e..14898dfe1 100644
--- a/t/txinfo-no-installinfo.sh
+++ b/t/txinfo-no-installinfo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-no-repeated-targets.sh b/t/txinfo-no-repeated-targets.sh
index 884bc8591..87cc12da6 100644
--- a/t/txinfo-no-repeated-targets.sh
+++ b/t/txinfo-no-repeated-targets.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/txinfo-no-setfilename.sh b/t/txinfo-no-setfilename.sh
index 225e1880d..21fcfea76 100644
--- a/t/txinfo-no-setfilename.sh
+++ b/t/txinfo-no-setfilename.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2019-2020 Free Software Foundation, Inc.
+# Copyright (C) 2019-2021 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
diff --git a/t/txinfo-nodist-info.sh b/t/txinfo-nodist-info.sh
index cd2831dcb..676ffceb0 100644
--- a/t/txinfo-nodist-info.sh
+++ b/t/txinfo-nodist-info.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2020 Free Software Foundation, Inc.
+# Copyright (C) 2013-2021 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
diff --git a/t/txinfo-other-suffixes.sh b/t/txinfo-other-suffixes.sh
index d18646cea..498b03da1 100644
--- a/t/txinfo-other-suffixes.sh
+++ b/t/txinfo-other-suffixes.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/txinfo-override-infodeps.sh b/t/txinfo-override-infodeps.sh
index 791e45837..12ef4b4d3 100644
--- a/t/txinfo-override-infodeps.sh
+++ b/t/txinfo-override-infodeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/txinfo-override-texinfo-tex.sh b/t/txinfo-override-texinfo-tex.sh
index 202b0ed01..bc41ed4af 100644
--- a/t/txinfo-override-texinfo-tex.sh
+++ b/t/txinfo-override-texinfo-tex.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
index ff6853631..43725e5f7 100644
--- a/t/txinfo-setfilename-repeated.sh
+++ b/t/txinfo-setfilename-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/txinfo-setfilename-suffix-strip.sh b/t/txinfo-setfilename-suffix-strip.sh
index 381cd2f06..dbf1f7e2f 100644
--- a/t/txinfo-setfilename-suffix-strip.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/txinfo-subdir-pr343.sh b/t/txinfo-subdir-pr343.sh
index 4b8f60d2d..51fdd77af 100644
--- a/t/txinfo-subdir-pr343.sh
+++ b/t/txinfo-subdir-pr343.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/txinfo-tex-dist.sh b/t/txinfo-tex-dist.sh
index 1cdf90a9a..654e27c25 100644
--- a/t/txinfo-tex-dist.sh
+++ b/t/txinfo-tex-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/txinfo-unrecognized-extension.sh b/t/txinfo-unrecognized-extension.sh
index 45a596fc7..fc3e9a2da 100644
--- a/t/txinfo-unrecognized-extension.sh
+++ b/t/txinfo-unrecognized-extension.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/txinfo-unrecognized-info-suffix.sh b/t/txinfo-unrecognized-info-suffix.sh
index 656507d5d..1d2765e33 100644
--- a/t/txinfo-unrecognized-info-suffix.sh
+++ b/t/txinfo-unrecognized-info-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/txinfo-vtexi.sh b/t/txinfo-vtexi.sh
index f36ce63f9..633e212b8 100644
--- a/t/txinfo-vtexi.sh
+++ b/t/txinfo-vtexi.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/txinfo-vtexi2.sh b/t/txinfo-vtexi2.sh
index 91bef676c..c482ae6cb 100644
--- a/t/txinfo-vtexi2.sh
+++ b/t/txinfo-vtexi2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/txinfo-vtexi3.sh b/t/txinfo-vtexi3.sh
index 7322aa021..52d758279 100644
--- a/t/txinfo-vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/txinfo-vtexi4.sh b/t/txinfo-vtexi4.sh
index af6dcff06..c0e9eb0fd 100644
--- a/t/txinfo-vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/txinfo-without-info-suffix.sh b/t/txinfo-without-info-suffix.sh
index 648e71c3d..ec0888733 100644
--- a/t/txinfo-without-info-suffix.sh
+++ b/t/txinfo-without-info-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/txinfo19.sh b/t/txinfo19.sh
index d23c5718c..f35fc1006 100644
--- a/t/txinfo19.sh
+++ b/t/txinfo19.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index 89523df5d..6129da958 100644
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index 328ffe954..e74367943 100644
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index 44b3690ff..c85d6750a 100644
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index 7ca6bc227..791c7c07e 100644
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 59f8aa7d1..948b5a9d1 100644
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
index a9f318a39..98933df1e 100644
--- a/t/uninstall-pr9578.sh
+++ b/t/uninstall-pr9578.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/unused.sh b/t/unused.sh
index 067d6fe92..de15860ec 100644
--- a/t/unused.sh
+++ b/t/unused.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/upc.sh b/t/upc.sh
index 38816890c..e2c8ca822 100644
--- a/t/upc.sh
+++ b/t/upc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/upc2.sh b/t/upc2.sh
index ba2978b78..f0d6c04a4 100644
--- a/t/upc2.sh
+++ b/t/upc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/upc3.sh b/t/upc3.sh
index 7291f58fc..7ad2a8723 100644
--- a/t/upc3.sh
+++ b/t/upc3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 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
diff --git a/t/vala-configure.sh b/t/vala-configure.sh
index ea46acc84..c9e1e97fb 100644
--- a/t/vala-configure.sh
+++ b/t/vala-configure.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2020 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 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
diff --git a/t/vala-grepping.sh b/t/vala-grepping.sh
index 5bf5d2bdb..d9d984f50 100644
--- a/t/vala-grepping.sh
+++ b/t/vala-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index 8ba0b072b..fc563fe7b 100644
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
@@ -45,6 +45,12 @@ zardoz_VALAFLAGS = \
AM_CFLAGS = $(GOBJECT_CFLAGS)
LDADD = $(GOBJECT_LIBS)
+
+# Tell GNU make not to parallelize, since the tests can result in, for example:
+# mv: cannot stat 'quux_vala.stamp-t': No such file or directory
+# make[1]: *** [Makefile:438: quux_vala.stamp] Error 1
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
END
headers='HDR.h hello.vapi foo.h foo2.h foo3.vapi'
diff --git a/t/vala-libs-distcheck.sh b/t/vala-libs-distcheck.sh
index a12c8d401..b923f9347 100644
--- a/t/vala-libs-distcheck.sh
+++ b/t/vala-libs-distcheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-libs-vpath.sh b/t/vala-libs-vpath.sh
index 73fbffda2..6cbc6e632 100644
--- a/t/vala-libs-vpath.sh
+++ b/t/vala-libs-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index 9bd8a4a2c..5fff10d2d 100644
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index f92eb4a85..b614761e5 100644
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 933a3ffca..ee04422bc 100644
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
index 8113e471c..e5bd082e2 100644
--- a/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index 8c012552e..a74d63ca8 100644
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
index e37fe60d8..08846016b 100644
--- a/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
index 117b27ef4..dd99e9099 100644
--- a/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index ea096746c..ede8cf33f 100644
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 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
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index d3d0ff135..0074e9d83 100644
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/var-recurs.sh b/t/var-recurs.sh
index d77feb252..075536e74 100644
--- a/t/var-recurs.sh
+++ b/t/var-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/var-recurs2.sh b/t/var-recurs2.sh
index 33cf5c4c1..0bdde0412 100644
--- a/t/var-recurs2.sh
+++ b/t/var-recurs2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/vars.sh b/t/vars.sh
index 9949a40f2..e0b85bf98 100644
--- a/t/vars.sh
+++ b/t/vars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/vars3.sh b/t/vars3.sh
index bbe598933..c5c30364b 100644
--- a/t/vars3.sh
+++ b/t/vars3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/vartar.sh b/t/vartar.sh
index fbca845e6..d542bda5f 100644
--- a/t/vartar.sh
+++ b/t/vartar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/vartypo2.sh b/t/vartypo2.sh
index 1c96baad8..81e1edd0b 100644
--- a/t/vartypo2.sh
+++ b/t/vartypo2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/vartypos.sh b/t/vartypos.sh
index 0a2e90ced..1a0cbf711 100644
--- a/t/vartypos.sh
+++ b/t/vartypos.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/version3.sh b/t/version3.sh
index 0d1779761..7197b5d75 100644
--- a/t/version3.sh
+++ b/t/version3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/version4.sh b/t/version4.sh
index a61a19fd9..a4a81225b 100644
--- a/t/version4.sh
+++ b/t/version4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/version6.sh b/t/version6.sh
index 615bfba90..2a4600c61 100644
--- a/t/version6.sh
+++ b/t/version6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/version7.sh b/t/version7.sh
index 3e283cb35..5af835a7f 100644
--- a/t/version7.sh
+++ b/t/version7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/version8.sh b/t/version8.sh
index 2344c52ed..45b4c8a70 100644
--- a/t/version8.sh
+++ b/t/version8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2020 Free Software Foundation, Inc.
+# Copyright (C) 2005-2021 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
diff --git a/t/vpath.sh b/t/vpath.sh
index c0f545238..b647b9815 100644
--- a/t/vpath.sh
+++ b/t/vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/warning-groups-win-over-strictness.sh b/t/warning-groups-win-over-strictness.sh
index 8610a134e..c1a6cd55a 100644
--- a/t/warning-groups-win-over-strictness.sh
+++ b/t/warning-groups-win-over-strictness.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index bb2a7b059..3b6cdb8db 100644
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
index 4809b0e54..8b77a27b7 100644
--- a/t/warnings-override.sh
+++ b/t/warnings-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
index 115231760..25e31e8ae 100644
--- a/t/warnings-precedence.sh
+++ b/t/warnings-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-strictness-interactions.sh b/t/warnings-strictness-interactions.sh
index 14f9c4b4f..5a6f4c13f 100644
--- a/t/warnings-strictness-interactions.sh
+++ b/t/warnings-strictness-interactions.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
index f4c1107b9..f3a4f00a8 100644
--- a/t/warnings-unknown.sh
+++ b/t/warnings-unknown.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnings-win-over-strictness.sh b/t/warnings-win-over-strictness.sh
index f368f7914..f63cdb048 100644
--- a/t/warnings-win-over-strictness.sh
+++ b/t/warnings-win-over-strictness.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/warnopts.sh b/t/warnopts.sh
index fa503e0cb..58012c3e0 100644
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/werror.sh b/t/werror.sh
index ee0153c41..428bca9bb 100644
--- a/t/werror.sh
+++ b/t/werror.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/werror2.sh b/t/werror2.sh
index a4ebf50f3..d23c46118 100644
--- a/t/werror2.sh
+++ b/t/werror2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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
diff --git a/t/werror3.sh b/t/werror3.sh
index 20a2344b2..cb06b2944 100644
--- a/t/werror3.sh
+++ b/t/werror3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/werror4.sh b/t/werror4.sh
index 062af2e37..8897221b1 100644
--- a/t/werror4.sh
+++ b/t/werror4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/whoami.sh b/t/whoami.sh
index f5bf36283..2c235cee1 100644
--- a/t/whoami.sh
+++ b/t/whoami.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2020 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 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
diff --git a/t/xsource.sh b/t/xsource.sh
index 555ffbf4c..7339ecfe0 100644
--- a/t/xsource.sh
+++ b/t/xsource.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
index ea6d2bb35..888a2f5cd 100644
--- a/t/yacc-auxdir.sh
+++ b/t/yacc-auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index 4fe285841..cfbaa1957 100644
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index 8b5e22055..adbd26c0e 100644
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index 64b6e0a87..60e85dd85 100644
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index 82f46aa31..fe2795894 100644
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
index a2a1eb16e..9ea13a704 100644
--- a/t/yacc-clean.sh
+++ b/t/yacc-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh
index 711105ef9..7d5e6143a 100644
--- a/t/yacc-cxx-grepping.sh
+++ b/t/yacc-cxx-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 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
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 1ceb77687..0e163eb44 100644
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index 43cc5fbf1..66c11063e 100644
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index 0cbabe097..cc4d16e74 100644
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
index 041a4b327..e0fb951f2 100644
--- a/t/yacc-d-vpath.sh
+++ b/t/yacc-d-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index 2f6811b24..766caac5c 100644
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index 793a8e937..27c704b3d 100644
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index 80191dc4a..ce730f42b 100644
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 1df749e35..c918c3996 100644
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
index c47366eb5..5e1a2a70a 100644
--- a/t/yacc-dist-nobuild.sh
+++ b/t/yacc-dist-nobuild.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh
index 1ec33860e..c9c1aa2e0 100644
--- a/t/yacc-dry.sh
+++ b/t/yacc-dry.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh
index e6f8fb5a6..5b7412702 100644
--- a/t/yacc-grepping.sh
+++ b/t/yacc-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 4802754b7..448a7fec6 100644
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh
index 5281c6057..7f7094525 100644
--- a/t/yacc-headers-and-dist-pr47.sh
+++ b/t/yacc-headers-and-dist-pr47.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index 33b1e0aaa..10e8a8cd4 100644
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh
index 958c5218a..2371a099f 100644
--- a/t/yacc-misc.sh
+++ b/t/yacc-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 95ca6ebb4..ad9bf9523 100644
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
index c7999aa24..075e07743 100644
--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh
index 699946106..9606f7b3d 100644
--- a/t/yacc-pr204.sh
+++ b/t/yacc-pr204.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
index 4f516cfa3..5f3862187 100644
--- a/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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
diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh
index 315d7d64c..f9bb719da 100644
--- a/t/yacc-vpath.sh
+++ b/t/yacc-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 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
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
index c3c24b8da..24eb7d9c6 100644
--- a/t/yacc-weirdnames.sh
+++ b/t/yacc-weirdnames.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
index 2a5947f88..eaee47849 100644
--- a/t/yflags-cmdline-override.sh
+++ b/t/yflags-cmdline-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh
index c17350434..867f101ea 100644
--- a/t/yflags-conditional.sh
+++ b/t/yflags-conditional.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-cxx.sh b/t/yflags-cxx.sh
index c7af3b7a2..136390c5d 100644
--- a/t/yflags-cxx.sh
+++ b/t/yflags-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
index 5ffbe9b05..18568be03 100644
--- a/t/yflags-d-false-positives.sh
+++ b/t/yflags-d-false-positives.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
index 3b7c32790..68976f02a 100644
--- a/t/yflags-force-conditional.sh
+++ b/t/yflags-force-conditional.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
index 191fd60fd..2d5cb55e1 100644
--- a/t/yflags-force-override.sh
+++ b/t/yflags-force-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
index 69ebab8c0..055a915c2 100644
--- a/t/yflags-var-expand.sh
+++ b/t/yflags-var-expand.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
diff --git a/t/yflags.sh b/t/yflags.sh
index 1db59f9bf..97f93c762 100644
--- a/t/yflags.sh
+++ b/t/yflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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