[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-85-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-85-ge33c68a |
|
Date: |
Tue, 02 Jun 2009 18:19:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e33c68a07166f4e8d70ae230512a5f8379078455
The branch, master has been updated
via e33c68a07166f4e8d70ae230512a5f8379078455 (commit)
via 88eb57b776b5709f16fe10bc76c5f20bc0a62414 (commit)
via 218e678b571d804388c7a8726544c170e49c0d03 (commit)
via d4c4b5dd1a131392d28d7c77c054f9b4dcc17f82 (commit)
via 77c93b3e7b7cf3182857fc43e0588ce42fa574e5 (commit)
via d9bd0090cf471a088bc0119cd989c06a63d2408e (commit)
via edf543567edfbd3e4d658180fdb2cb2b26eb9783 (commit)
via 6d44a667bd1307162187efe7514e6d4abd122dd6 (commit)
via 32e88686a445c06126ef473460d9762d19d5ae8d (commit)
via 14d89bad6d1de0d8fa66d0474c81024caa0c40f1 (commit)
via 639f95c3acd69e47fd2fb43edeb8103c253026fe (commit)
via 8c8e4bcee5578658b24d394f1b0f3a39e6cd7a2b (commit)
via 2da14d759b317983dd3a623fd0b213788996fca6 (commit)
via d52ce1fc9697f651b295cdabd8ebf6cff4ea8916 (commit)
via 23aa3dbbf5d5a28a33604599eb4f848f293e9933 (commit)
via c87d38b4db0e899509bc9a0e6a659f0f4a67bc6a (commit)
via 5619672f6719717e799f1839125bd6aff8dc4588 (commit)
via 2505a3e3339d3455ed187a5d2ad85730eea0e608 (commit)
via 43ec8aecbf9fe8dda07d1909be21c055ee9d7ee0 (commit)
via fcf2f56062e384455ec8b1aed943af33f20c27c7 (commit)
via 65f53cc178cd5876f0fff48d8fd5c35e19bd00d0 (commit)
via 7fa2890c4ec91ae20589eee67eef0be9bcbe159b (commit)
via 5ad5fdf48e88ea0b0efd5b35aae464fac73a58d5 (commit)
via 0e411a0410d6461dd85941bf1121921475426275 (commit)
via de458bcc8b6cf5e54b76242f8f27afa330c858c7 (commit)
via 6cfa5cb8a21957774301cf07cdcf012531274465 (commit)
via 0619d4094ad8f5e6d3da97fcc34ff3970b7b0870 (commit)
via 1776fe3959a09838250a69c8a15fd0dd4fcb3504 (commit)
via b9d837379de93389244d75dfbcb6d33ed66d4f9f (commit)
via b629ff7b3ed15c44147ebe87e1afb554f22e83a9 (commit)
via 27f63d48b2cbf9a8a0af1185821929fade57298f (commit)
via b6bebfca48c126f13ff9ddc86c809564b3d7e56a (commit)
via 553f13a39d6d340d47f2c6875dc6f69cf0376b59 (commit)
via 9fe8259884e73d48c1962ba69cbb9aa59050b000 (commit)
via 763de95bebe871a69b2e9378dca5a0db6834077b (commit)
via f68743fb0d1f2a3215c862ae7a5f7138daddf98f (commit)
from ebd8c6da618f519bde2559b7db750e1185a7f9a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e33c68a07166f4e8d70ae230512a5f8379078455
Merge: d4c4b5dd1a131392d28d7c77c054f9b4dcc17f82
88eb57b776b5709f16fe10bc76c5f20bc0a62414
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 24 16:42:59 2009 +0200
Merge branch 'maint'
commit 88eb57b776b5709f16fe10bc76c5f20bc0a62414
Author: Jack Kelly <address@hidden>
Date: Sun May 24 16:38:33 2009 +0200
AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
* tests/gcj6.test: New test.
* tests/Makefile.am: Update; mark gcj6.test as XFAIL.
* THANKS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 218e678b571d804388c7a8726544c170e49c0d03
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 24 09:03:00 2009 +0200
parallel-tests: avoid GNU make 3.80 substitution bug.
* lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
`.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
to work around GNU make 3.80 substitution reference issue with
trailing white space in the variable.
* tests/parallel-tests10.test: New test.
* tests/parallel-tests6.test: Update comment.
* tests/Makefile.am: Update.
* NEWS: Update.
Report by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit d4c4b5dd1a131392d28d7c77c054f9b4dcc17f82
Merge: 14d89bad6d1de0d8fa66d0474c81024caa0c40f1
77c93b3e7b7cf3182857fc43e0588ce42fa574e5
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 24 14:46:45 2009 +0200
Merge branch 'maint'
commit 77c93b3e7b7cf3182857fc43e0588ce42fa574e5
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 23 23:08:31 2009 +0200
testsuite: unset installation directory variables.
* tests/defs.in: Before test execution, be sure to unset all
installation directory variables, so they cannot have an effect
on a `make -e install' command within a test.
Report by Dagobert Michelsen.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit d9bd0090cf471a088bc0119cd989c06a63d2408e
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 23 23:05:17 2009 +0200
testsuite: do not change the mode of installed Libtool files.
* tests/defs.in: Do not use `chmod -R' on the test directory, as
that may change or try to change the mode of installed files:
the test directory may contain symlinks to ltmain.sh files from
a Libtool installation, and Solaris `chmod -R' touches symlink
targets. Instead, use the cleanup strategy used in distdir.am.
* NEWS: Update.
Report by Dagobert Michelsen.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit edf543567edfbd3e4d658180fdb2cb2b26eb9783
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 23 22:54:15 2009 +0200
testsuite: do not fail in cleanup code.
* tests/defs.in: Turn off errexit in the cleanup trap, to avoid
a test failure due to a nonzero command.
* THANKS: Update.
Report by Dagobert Michelsen.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 6d44a667bd1307162187efe7514e6d4abd122dd6
Author: Peter O'Gorman <address@hidden>
Date: Sat May 23 22:13:14 2009 +0200
python: do not install in system directories on Darwin 9.
On Darwin 9, get_python_lib returns a path below `/Library/Python'
regardless of the `prefix' argument it was passed, causing `make
install' to target the system directories regardless of `--prefix'
argument used. Work around this Darwin bug by ignoring the result
of get_python_lib if it points outside of the passed prefix, and
the prefix was not a system directory.
* m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
initial portion of the pythondir returned by get_python_lib, then
ignore it unless the configured prefix is `/usr' or starts with
`/System'. Fixes instmany-python.test failure on Mac OS X 10.5.7.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 32e88686a445c06126ef473460d9762d19d5ae8d
Author: Ralf Wildenhues <address@hidden>
Date: Sat May 23 22:06:07 2009 +0200
Clarify how to enable `silent-rules' and other global options.
* doc/automake.texi (Options): When introducing options, be more
careful to note that not all of them can be specified in
AUTOMAKE_OPTIONS statements, and that some do not make sense in
subdirectories. Note more prominently that `silent-rules' can
only be specified in configure.ac.
* lib/Automake/Options.pm (_process_option_list): Improve error
message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
options specified in Makefile.am files.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 14d89bad6d1de0d8fa66d0474c81024caa0c40f1
Merge: 8c8e4bcee5578658b24d394f1b0f3a39e6cd7a2b
639f95c3acd69e47fd2fb43edeb8103c253026fe
Author: Ralf Wildenhues <address@hidden>
Date: Thu May 21 17:18:05 2009 +0200
Merge branch 'maint'
commit 639f95c3acd69e47fd2fb43edeb8103c253026fe
Author: Ralf Wildenhues <address@hidden>
Date: Thu May 21 17:17:10 2009 +0200
Skip specflg10.test without a C++ compiler.
* tests/specflg10.test: Require g++.
Report by Thien-Thi Nguyen.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 8c8e4bcee5578658b24d394f1b0f3a39e6cd7a2b
Merge: d52ce1fc9697f651b295cdabd8ebf6cff4ea8916
2da14d759b317983dd3a623fd0b213788996fca6
Author: Ralf Wildenhues <address@hidden>
Date: Tue May 19 07:49:44 2009 +0200
Merge branch 'maint'
commit 2da14d759b317983dd3a623fd0b213788996fca6
Author: Ralf Wildenhues <address@hidden>
Date: Tue May 19 07:49:27 2009 +0200
Revert last patch, IRIX has an editor named `jot'.
* tests/instmany-mans.test: Do not try `jot'.
* tests/instmany-python.test: Likewise.
* tests/instmany.test: Likewise.
Report by Peter O'Gorman.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit d52ce1fc9697f651b295cdabd8ebf6cff4ea8916
Merge: 5619672f6719717e799f1839125bd6aff8dc4588
23aa3dbbf5d5a28a33604599eb4f848f293e9933
Author: Ralf Wildenhues <address@hidden>
Date: Mon May 18 23:03:32 2009 +0200
Merge branch 'maint'
commit 23aa3dbbf5d5a28a33604599eb4f848f293e9933
Author: Ralf Wildenhues <address@hidden>
Date: Mon May 18 20:57:05 2009 +0200
testsuite: also try `jot' as `seq' replacement.
* tests/instmany-mans.test: Try BSD `jot' before resorting to a
slow but portable shell loop.
* tests/instmany-python.test: Likewise.
* tests/instmany.test: Likewise.
Suggestion by Peter O'Gorman.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit c87d38b4db0e899509bc9a0e6a659f0f4a67bc6a
Author: Ralf Wildenhues <address@hidden>
Date: Mon May 18 20:52:59 2009 +0200
Fix test failure when pkg.m4 is not found, only pkg-config.
* tests/vala5.test: Update comment, this test is not expected to
fail any more. Require valac version 0.7.0. Skip if configure
fails, could be due to unexpanded PKG_CHECK_MODULES or too old
valac.
Report by Simon Josefsson.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 5619672f6719717e799f1839125bd6aff8dc4588
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 17:20:26 2009 +0200
Post-release version bump.
* configure.ac, NEWS: Bump version to 1.11a.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 2505a3e3339d3455ed187a5d2ad85730eea0e608
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 16:25:01 2009 +0200
Version 1.11.
* configure.ac: Bump version to 1.11.
* doc/automake.texi (Releases): Add line for 1.11. Remove line
for 1.10b.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 43ec8aecbf9fe8dda07d1909be21c055ee9d7ee0
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 15:51:21 2009 +0200
Fix maintainer-check failures.
* automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
of plain `cd'.
* tests/vala2.test: Use `rm -f' instead of `rm'.
commit fcf2f56062e384455ec8b1aed943af33f20c27c7
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 15:32:40 2009 +0200
Revert Automake license to GPLv2+.
Automake will move to GPLv3+ once the Exception statement has
been rewritten to use the new GPLv3 exception language. This
change does not impact the COPYING file that may be installed
by `automake --add-missing'.
* COPYING: Revert to GPLv2. All uses changed.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 65f53cc178cd5876f0fff48d8fd5c35e19bd00d0
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 15:15:43 2009 +0200
Rewrite NEWS for 1.11.
* NEWS: Rewrite, merging 1.10b and 1.10c entries.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 7fa2890c4ec91ae20589eee67eef0be9bcbe159b
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 14:13:44 2009 +0200
Sync auxiliary files from upstream.
* lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
upstream.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 5ad5fdf48e88ea0b0efd5b35aae464fac73a58d5
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 14:12:24 2009 +0200
Update release statistics, improve release-stats rule.
* Makefile.am (release-stats): Output stderr of pstops in
addition to catching it, for better debugging.
* doc/automake.texi (Releases): Add line for 1.10.2.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 0e411a0410d6461dd85941bf1121921475426275
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 12:03:47 2009 +0200
Cope with parallel BSD make -jN semantics.
When BSD `make -jN' is used without `-B' which enables backwards
compatible semantics, it may reuse the same shell for several
commands within a rule; so ensure we do not leave it in a
different directory, nor `exit 0' early in a multi-command rule.
* lib/am/distdir.am (distcheck): After running `distcleancheck',
change back to original working directory.
* lib/am/remake-hdr.am (%CONFIG_HIN%): Run autoheader in a
subshell.
* lib/am/mans.am (uninstall-man%SECTION%): Do not `exit 0' early
in a rule that consists of several shell invocations. Parallel
NetBSD `make -jN' without `-B' will use only one shell for all
commands, but won't respawn one after `exit 0'. Fixes
notrans.test failure.
* tests/makej2.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit de458bcc8b6cf5e54b76242f8f27afa330c858c7
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 11:55:14 2009 +0200
Fix typo in comment.
* lib/am/install.am: Fix typo.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 6cfa5cb8a21957774301cf07cdcf012531274465
Author: Matthias Klose <address@hidden>
Date: Sun May 17 11:29:16 2009 +0200
Let AM_PATH_PYTHON honor python's idea about the site directory.
* m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and
pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix'
to get_python_lib, so python can determine the name of the site
directory depending on the install location. Afterwards, replace
the directory names with the unexpanded values of $PYTHON_PREFIX
resp. $PYTHON_EXEC_PREFIX again, to allow override according to
the documentation. Fixes site directory computation for Debian
and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local',
`site-packages' elsewhere).
* NEWS, THANKS: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 0619d4094ad8f5e6d3da97fcc34ff3970b7b0870
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 17 10:26:15 2009 +0200
Vala: for now, require GNU make.
* doc/automake.texi (Vala Support): GNU make is currently
required for Vala sources.
* tests/vala2.test, tests/vala3.test, tests/vala5.test: Require
GNU make.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 1776fe3959a09838250a69c8a15fd0dd4fcb3504
Author: Jürg Billeter <address@hidden>
Date: Fri May 15 15:51:03 2009 +0200
Vala: Use $(srcdir) in rebuild rules.
valac is always run in srcdir as the generated files are distributed.
So srcdir needs to be taken into account in the rebuild rules to not
wrongly trigger a rebuild in the wrong directory.
* automake.in (lang_vala_finish_target): Rebuild files in
$(srcdir).
* tests/vala2.test: Test rebuild rules from VPATH build.
Signed-off-by: Jürg Billeter <address@hidden>
Signed-off-by: Ralf Wildenhues <address@hidden>
commit b9d837379de93389244d75dfbcb6d33ed66d4f9f
Author: Jürg Billeter <address@hidden>
Date: Fri May 15 15:50:59 2009 +0200
Vala: Add and test rebuild rules for generated header and vapi files.
valac will generate additional files when using, for example, -H in
VALAFLAGS. We need to recognize these options and add appropriate
rebuild rules to fix parallel build.
* automake.in (lang_vala_finish_target): Recognize -H, -h,
--header, --internal-header, --vapi, --internal-api, --gir flags
to valac and rebuild rules for generated headers; distribute
and maintainer-clean them.
* tests/vala2.test: Test rebuild rules.
Signed-off-by: Jürg Billeter <address@hidden>
Signed-off-by: Ralf Wildenhues <address@hidden>
commit b629ff7b3ed15c44147ebe87e1afb554f22e83a9
Author: Jürg Billeter <address@hidden>
Date: Sun May 17 10:14:13 2009 +0200
Vala: Fix build when using per-target VALAFLAGS.
This does not yet implement full per-target support for VALAFLAGS,
however, this change at least fixes building when there is only one
target per source file, which is the most common situation.
* automake.in: Remove `VALAFLAGS' from `flags' in language struct.
(lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually
here; check `VALAFLAGS' user variables.
* tests/Makefile.am (XFAIL_TESTS): Remove vala5.test.
* doc/automake.texi (Vala Support): Document per-target flag
limitations.
Signed-off-by: Jürg Billeter <address@hidden>
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 27f63d48b2cbf9a8a0af1185821929fade57298f
Author: Ralf Wildenhues <address@hidden>
Date: Tue May 12 00:15:43 2009 +0200
Document some formatting restrictions for Makefile.am files.
For PR automake/540:
* doc/automake.texi (General Operation, Usage of Conditionals):
Variable assignments should not be indented by TABs, rule commands
should. Conditional keyword statements should not be indented.
Report by address@hidden
Signed-off-by: Ralf Wildenhues <address@hidden>
commit b6bebfca48c126f13ff9ddc86c809564b3d7e56a
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 3 09:59:21 2009 +0200
Fix copyright years in *.am files.
* lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
lib/am/program.am, lib/am/tags.am: Fix copyright years.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 553f13a39d6d340d47f2c6875dc6f69cf0376b59
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 3 09:47:58 2009 +0200
distdir: avoid duplicate `find' traversal with subpackages.
* lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
`am__skip_mode_fix'.
[%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
walk.
* tests/subpkg4.test: New test, to ensure that we still walk the
whole tree while fixing permissions. We don't ensure it is
walked once only.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 9fe8259884e73d48c1962ba69cbb9aa59050b000
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 3 09:32:44 2009 +0200
Disable test cleanup trap with OSF1/Tru64 sh.
* configure.ac: Test whether /bin/sh has working 'set -e'
in conjunction with an exit trap. Set $am_cv_sh_errexit_works
accordingly, substitute sh_errexit_works, and warn about
leftover test directories with broken shells like Tru64 /bin/sh.
* tests/defs.in: Do not install any traps with broken shells.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 763de95bebe871a69b2e9378dca5a0db6834077b
Author: Bruno Haible <address@hidden>
Date: Sat May 2 09:26:58 2009 +0200
Recommend *-local hooks without commands, for extensibility.
* doc/automake.texi (Clean): Show how to write the clean-local
extension with separate phony target.
* tests/Makefile.am (clean-local-check): Practice what we preach
by marking this phony. For consistency, rename from ...
(check-clean-local): ... this.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit f68743fb0d1f2a3215c862ae7a5f7138daddf98f
Author: Eric Blake <address@hidden>
Date: Tue Apr 28 15:19:41 2009 -0600
scripts: normalize all timestamps to UTC
* lib/compile (scriptversion): Update emacs hook.
* lib/depcomp (scriptversion): Likewise.
* lib/elisp-comp (scriptversion): Likewise.
* lib/gnupload (scriptversion): Likewise.
* lib/install-sh (scriptversion): Likewise.
* lib/mdate-sh (scriptversion): Likewise.
* lib/missing (scriptversion): Likewise.
* lib/mkinstalldirs (scriptversion): Likewise.
* lib/py-compile (scriptversion): Likewise.
* lib/ylwrap (scriptversion): Likewise.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
COPYING | 911 ++++++-------------
ChangeLog | 273 ++++++
HACKING | 2 +-
Makefile.am | 3 +-
Makefile.in | 15 +-
NEWS | 107 +--
README | 2 +-
THANKS | 4 +
TODO | 2 +-
aclocal.in | 4 +-
aclocal.m4 | 2 +-
automake.in | 55 +-
bootstrap | 2 +-
configure | 49 +-
configure.ac | 21 +-
doc/Makefile.am | 2 +-
doc/Makefile.in | 9 +-
doc/automake.texi | 52 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/Automake/Channels.pm | 2 +-
lib/Automake/Condition.pm | 2 +-
lib/Automake/Config.in | 2 +-
lib/Automake/Configure_ac.pm | 2 +-
lib/Automake/DisjConditions.pm | 2 +-
lib/Automake/FileUtils.pm | 2 +-
lib/Automake/General.pm | 2 +-
lib/Automake/Item.pm | 2 +-
lib/Automake/ItemDef.pm | 2 +-
lib/Automake/Location.pm | 2 +-
lib/Automake/Makefile.am | 2 +-
lib/Automake/Makefile.in | 6 +-
lib/Automake/Options.pm | 8 +-
lib/Automake/Rule.pm | 2 +-
lib/Automake/RuleDef.pm | 2 +-
lib/Automake/Struct.pm | 2 +-
lib/Automake/VarDef.pm | 2 +-
lib/Automake/Variable.pm | 2 +-
lib/Automake/Version.pm | 2 +-
lib/Automake/Wrap.pm | 2 +-
lib/Automake/XFile.pm | 2 +-
lib/Automake/tests/Condition-t.pl | 2 +-
lib/Automake/tests/Condition.pl | 2 +-
lib/Automake/tests/DisjConditions-t.pl | 2 +-
lib/Automake/tests/DisjConditions.pl | 2 +-
lib/Automake/tests/Makefile.am | 2 +-
lib/Automake/tests/Makefile.in | 12 +-
lib/Automake/tests/Version.pl | 2 +-
lib/Automake/tests/Wrap.pl | 2 +-
lib/Makefile.am | 2 +-
lib/Makefile.in | 6 +-
lib/acinstall | 2 +-
lib/am/Makefile.am | 2 +-
lib/am/Makefile.in | 3 +-
lib/am/ansi2knr.am | 2 +-
lib/am/check.am | 15 +-
lib/am/check2.am | 4 +-
lib/am/clean-hdr.am | 2 +-
lib/am/clean.am | 2 +-
lib/am/compile.am | 2 +-
lib/am/configure.am | 2 +-
lib/am/data.am | 2 +-
lib/am/dejagnu.am | 2 +-
lib/am/depend.am | 2 +-
lib/am/depend2.am | 2 +-
lib/am/distdir.am | 25 +-
lib/am/footer.am | 2 +-
lib/am/header-vars.am | 2 +-
lib/am/header.am | 2 +-
lib/am/inst-vars.am | 2 +-
lib/am/install.am | 4 +-
lib/am/java.am | 2 +-
lib/am/lang-compile.am | 2 +-
lib/am/lex.am | 2 +-
lib/am/library.am | 2 +-
lib/am/libs.am | 2 +-
lib/am/libtool.am | 2 +-
lib/am/lisp.am | 2 +-
lib/am/ltlib.am | 2 +-
lib/am/ltlibrary.am | 2 +-
lib/am/mans-vars.am | 2 +-
lib/am/mans.am | 14 +-
lib/am/multilib.am | 2 +-
lib/am/program.am | 4 +-
lib/am/progs.am | 2 +-
lib/am/python.am | 2 +-
lib/am/remake-hdr.am | 7 +-
lib/am/scripts.am | 2 +-
lib/am/subdirs.am | 2 +-
lib/am/tags.am | 4 +-
lib/am/texi-vers.am | 2 +-
lib/am/texibuild.am | 2 +-
lib/am/texinfos.am | 2 +-
lib/am/vala.am | 2 +-
lib/am/yacc.am | 2 +-
lib/compile | 7 +-
lib/config.guess | 12 +-
lib/config.sub | 3 +-
lib/depcomp | 7 +-
lib/elisp-comp | 10 +-
lib/gnupload | 7 +-
lib/install-sh | 5 +-
lib/mdate-sh | 11 +-
lib/missing | 9 +-
lib/mkinstalldirs | 5 +-
lib/py-compile | 9 +-
lib/texinfo.tex | 15 +-
lib/ylwrap | 9 +-
m4/Makefile.am | 2 +-
m4/Makefile.in | 3 +-
m4/amversion.m4 | 6 +-
m4/python.m4 | 52 +-
tests/Makefile.am | 14 +-
tests/Makefile.in | 26 +-
tests/aclibobj.test | 2 +-
tests/acloca10.test | 2 +-
tests/acloca11.test | 2 +-
tests/acloca12.test | 2 +-
tests/acloca13.test | 2 +-
tests/acloca14.test | 2 +-
tests/acloca15.test | 2 +-
tests/acloca16.test | 2 +-
tests/acloca17.test | 2 +-
tests/acloca18.test | 2 +-
tests/acloca19.test | 2 +-
tests/acloca20.test | 2 +-
tests/acloca21.test | 2 +-
tests/aclocal.test | 2 +-
tests/aclocal3.test | 2 +-
tests/aclocal4.test | 2 +-
tests/aclocal5.test | 2 +-
tests/aclocal6.test | 2 +-
tests/aclocal7.test | 2 +-
tests/aclocal8.test | 2 +-
tests/aclocal9.test | 2 +-
tests/acoutbs.test | 2 +-
tests/acoutbs2.test | 2 +-
tests/acoutnoq.test | 2 +-
tests/acoutpt.test | 2 +-
tests/acoutpt2.test | 2 +-
tests/acoutqnl.test | 2 +-
tests/acsilent.test | 2 +-
tests/acsubst.test | 2 +-
tests/acsubst2.test | 2 +-
tests/all.test | 2 +-
tests/alloca.test | 2 +-
tests/alloca2.test | 2 +-
tests/alpha.test | 2 +-
tests/alpha2.test | 2 +-
tests/amassign.test | 2 +-
tests/ammissing.test | 2 +-
tests/amopt.test | 2 +-
tests/amsubst.test | 2 +-
tests/ansi.test | 2 +-
tests/ansi10.test | 2 +-
tests/ansi2.test | 2 +-
tests/ansi3.test | 2 +-
tests/ansi3b.test | 2 +-
tests/ansi4.test | 2 +-
tests/ansi5.test | 2 +-
tests/ansi6.test | 2 +-
tests/ansi7.test | 2 +-
tests/ansi8.test | 2 +-
tests/ansi9.test | 2 +-
tests/ar.test | 2 +-
tests/ar2.test | 2 +-
tests/asm.test | 2 +-
tests/asm2.test | 2 +-
tests/asm3.test | 2 +-
tests/autohdr.test | 2 +-
tests/autohdr2.test | 2 +-
tests/autohdr3.test | 2 +-
tests/autohdr4.test | 2 +-
tests/automake.test | 2 +-
tests/auxdir.test | 2 +-
tests/auxdir2.test | 2 +-
tests/auxdir3.test | 2 +-
tests/auxdir4.test | 2 +-
tests/backsl.test | 2 +-
tests/backsl2.test | 2 +-
tests/backsl3.test | 2 +-
tests/backsl4.test | 2 +-
tests/badline.test | 2 +-
tests/badopt.test | 2 +-
tests/badprog.test | 2 +-
tests/block.test | 2 +-
tests/bsource.test | 2 +-
tests/canon-name.test | 2 +-
tests/canon.test | 2 +-
tests/canon2.test | 2 +-
tests/canon3.test | 2 +-
tests/canon4.test | 2 +-
tests/canon5.test | 2 +-
tests/ccnoco.test | 2 +-
tests/ccnoco2.test | 2 +-
tests/check.test | 2 +-
tests/check10.test | 2 +-
tests/check11.test | 2 +-
tests/check2.test | 2 +-
tests/check3.test | 2 +-
tests/check4.test | 2 +-
tests/check5.test | 2 +-
tests/check6.test | 2 +-
tests/check7.test | 2 +-
tests/check8.test | 2 +-
tests/check9.test | 2 +-
tests/checkall.test | 2 +-
tests/clean.test | 2 +-
tests/clean2.test | 2 +-
tests/colneq.test | 2 +-
tests/colneq2.test | 2 +-
tests/colon.test | 2 +-
tests/colon2.test | 2 +-
tests/colon3.test | 2 +-
tests/colon4.test | 2 +-
tests/colon5.test | 2 +-
tests/colon6.test | 2 +-
tests/colon7.test | 2 +-
tests/color.test | 2 +-
tests/commen10.test | 2 +-
tests/commen11.test | 2 +-
tests/comment.test | 2 +-
tests/comment2.test | 2 +-
tests/comment3.test | 2 +-
tests/comment4.test | 2 +-
tests/comment5.test | 2 +-
tests/comment6.test | 2 +-
tests/comment7.test | 2 +-
tests/comment8.test | 2 +-
tests/comment9.test | 2 +-
tests/compile.test | 2 +-
tests/compile2.test | 2 +-
tests/compile_f90_c_cxx.test | 2 +-
tests/compile_f_c_cxx.test | 2 +-
tests/cond.test | 2 +-
tests/cond10.test | 2 +-
tests/cond11.test | 2 +-
tests/cond13.test | 2 +-
tests/cond14.test | 2 +-
tests/cond15.test | 2 +-
tests/cond16.test | 2 +-
tests/cond17.test | 2 +-
tests/cond18.test | 2 +-
tests/cond19.test | 2 +-
tests/cond2.test | 2 +-
tests/cond20.test | 2 +-
tests/cond21.test | 2 +-
tests/cond22.test | 2 +-
tests/cond23.test | 2 +-
tests/cond24.test | 2 +-
tests/cond25.test | 2 +-
tests/cond26.test | 2 +-
tests/cond27.test | 2 +-
tests/cond28.test | 2 +-
tests/cond29.test | 2 +-
tests/cond3.test | 2 +-
tests/cond30.test | 2 +-
tests/cond31.test | 2 +-
tests/cond32.test | 2 +-
tests/cond33.test | 2 +-
tests/cond34.test | 2 +-
tests/cond35.test | 2 +-
tests/cond36.test | 2 +-
tests/cond37.test | 2 +-
tests/cond38.test | 2 +-
tests/cond39.test | 2 +-
tests/cond4.test | 2 +-
tests/cond40.test | 2 +-
tests/cond41.test | 2 +-
tests/cond42.test | 2 +-
tests/cond43.test | 2 +-
tests/cond5.test | 2 +-
tests/cond6.test | 2 +-
tests/cond7.test | 2 +-
tests/cond8.test | 2 +-
tests/cond9.test | 2 +-
tests/condd.test | 2 +-
tests/condhook.test | 2 +-
tests/condinc.test | 2 +-
tests/condinc2.test | 2 +-
tests/condlib.test | 2 +-
tests/condman.test | 2 +-
tests/condman2.test | 2 +-
tests/conf2.test | 2 +-
tests/confdeps.test | 2 +-
tests/conff.test | 2 +-
tests/conff2.test | 2 +-
tests/confh.test | 2 +-
tests/confh4.test | 2 +-
tests/confh5.test | 2 +-
tests/config.test | 2 +-
tests/confincl.test | 2 +-
tests/conflnk.test | 2 +-
tests/conflnk2.test | 2 +-
tests/conflnk3.test | 2 +-
tests/conflnk4.test | 2 +-
tests/confsub.test | 2 +-
tests/confvar.test | 2 +-
tests/confvar2.test | 2 +-
tests/copy.test | 2 +-
tests/ctarget1.test | 2 +-
tests/cxx.test | 2 +-
tests/cxx2.test | 2 +-
tests/cxxansi.test | 2 +-
tests/cxxcpp.test | 2 +-
tests/cxxlibobj.test | 2 +-
tests/cxxlink.test | 2 +-
tests/cxxnoc.test | 2 +-
tests/cxxo.test | 2 +-
tests/cygwin32.test | 2 +-
tests/dash.test | 2 +-
tests/defs.in | 50 +-
tests/defun.test | 2 +-
tests/defun2.test | 2 +-
tests/dejagnu.test | 2 +-
tests/dejagnu2.test | 2 +-
tests/dejagnu3.test | 2 +-
tests/dejagnu4.test | 2 +-
tests/dejagnu5.test | 2 +-
tests/dejagnu6.test | 2 +-
tests/dejagnu7.test | 2 +-
tests/depacl2.test | 2 +-
tests/depcomp.test | 2 +-
tests/depcomp2.test | 2 +-
tests/depcomp3.test | 2 +-
tests/depcomp4.test | 2 +-
tests/depcomp5.test | 2 +-
tests/depcomp6.test | 2 +-
tests/depcomp7.test | 2 +-
tests/depdist.test | 2 +-
tests/depend.test | 2 +-
tests/depend2.test | 2 +-
tests/depend3.test | 2 +-
tests/depend4.test | 2 +-
tests/depend5.test | 2 +-
tests/depend6.test | 2 +-
tests/destdir.test | 2 +-
tests/dirforbid.test | 2 +-
tests/dirlist.test | 2 +-
tests/dirlist2.test | 2 +-
tests/discover.test | 2 +-
tests/distcleancheck.test | 2 +-
tests/distcom2.test | 2 +-
tests/distcom3.test | 2 +-
tests/distcom4.test | 2 +-
tests/distcom5.test | 2 +-
tests/distcom6.test | 2 +-
tests/distcom7.test | 2 +-
tests/distdir.test | 2 +-
tests/distname.test | 2 +-
tests/dollar.test | 2 +-
tests/dollarvar.test | 2 +-
tests/dollarvar2.test | 2 +-
tests/double.test | 2 +-
tests/dup2.test | 2 +-
tests/else.test | 2 +-
tests/empty.test | 2 +-
tests/empty2.test | 2 +-
tests/empty3.test | 2 +-
tests/empty4.test | 2 +-
tests/exdir.test | 2 +-
tests/exdir2.test | 2 +-
tests/exdir3.test | 2 +-
tests/exeext.test | 2 +-
tests/exeext2.test | 2 +-
tests/exeext3.test | 2 +-
tests/exeext4.test | 2 +-
tests/exsource.test | 2 +-
tests/ext.test | 2 +-
tests/ext2.test | 2 +-
tests/extra.test | 2 +-
tests/extra2.test | 2 +-
tests/extra3.test | 2 +-
tests/extra4.test | 2 +-
tests/extra5.test | 2 +-
tests/extra6.test | 2 +-
tests/extra7.test | 2 +-
tests/extra8.test | 2 +-
tests/f90only.test | 2 +-
tests/flavor.test | 2 +-
tests/flibs.test | 2 +-
tests/fn99.test | 2 +-
tests/fn99subdir.test | 2 +-
tests/fnoc.test | 2 +-
tests/fo.test | 2 +-
tests/fonly.test | 2 +-
tests/fort1.test | 2 +-
tests/fort2.test | 2 +-
tests/fort4.test | 2 +-
tests/fort5.test | 2 +-
tests/fortdep.test | 2 +-
tests/fpinst2.test | 2 +-
tests/fpinstall.test | 2 +-
tests/gcj.test | 2 +-
tests/gcj2.test | 2 +-
tests/gcj3.test | 2 +-
tests/gcj4.test | 2 +-
tests/gcj5.test | 2 +-
tests/{check11.test => gcj6.test} | 36 +-
tests/getopt.test | 2 +-
tests/gettext.test | 2 +-
tests/gettext2.test | 2 +-
tests/gettext3.test | 2 +-
tests/gnits.test | 2 +-
tests/gnits2.test | 2 +-
tests/gnits3.test | 2 +-
tests/gnumake.test | 2 +-
tests/gnuwarn.test | 2 +-
tests/gnuwarn2.test | 2 +-
tests/header.test | 2 +-
tests/help.test | 2 +-
tests/hfs.test | 2 +-
tests/hosts.test | 2 +-
tests/implicit.test | 2 +-
tests/include.test | 2 +-
tests/include2.test | 2 +-
tests/info.test | 2 +-
tests/init.test | 2 +-
tests/insh2.test | 2 +-
tests/install2.test | 2 +-
tests/installdir.test | 2 +-
tests/instdat.test | 2 +-
tests/instdat2.test | 2 +-
tests/instdir-java.test | 2 +-
tests/instdir-lisp.test | 2 +-
tests/instdir-ltlib.test | 2 +-
tests/instdir-prog.test | 2 +-
tests/instdir-python.test | 2 +-
tests/instdir-texi.test | 2 +-
tests/instdir.test | 2 +-
tests/instdir2.test | 2 +-
tests/instexec.test | 2 +-
tests/instfail-info.test | 2 +-
tests/instfail-java.test | 2 +-
tests/instfail-libtool.test | 2 +-
tests/instfail.test | 2 +-
tests/insthook.test | 2 +-
tests/instman.test | 2 +-
tests/instman2.test | 2 +-
tests/instmany-mans.test | 4 +-
tests/instmany-python.test | 4 +-
tests/instmany.test | 4 +-
tests/instsh.test | 2 +-
tests/instsh2.test | 2 +-
tests/instsh3.test | 2 +-
tests/instspc.test | 2 +-
tests/interp.test | 2 +-
tests/interp2.test | 2 +-
tests/java.test | 2 +-
tests/java2.test | 2 +-
tests/java3.test | 2 +-
tests/javaprim.test | 2 +-
tests/javasubst.test | 2 +-
tests/ldadd.test | 2 +-
tests/ldflags.test | 2 +-
tests/lex.test | 2 +-
tests/lex2.test | 2 +-
tests/lex3.test | 2 +-
tests/lex4.test | 2 +-
tests/lex5.test | 2 +-
tests/libexec.test | 2 +-
tests/libobj10.test | 2 +-
tests/libobj11.test | 2 +-
tests/libobj12.test | 2 +-
tests/libobj13.test | 2 +-
tests/libobj14.test | 2 +-
tests/libobj2.test | 2 +-
tests/libobj3.test | 2 +-
tests/libobj4.test | 2 +-
tests/libobj5.test | 2 +-
tests/libobj7.test | 2 +-
tests/libobj8.test | 2 +-
tests/library.test | 2 +-
tests/library2.test | 2 +-
tests/library3.test | 2 +-
tests/libtoo10.test | 2 +-
tests/libtoo11.test | 2 +-
tests/libtool.test | 2 +-
tests/libtool2.test | 2 +-
tests/libtool3.test | 2 +-
tests/libtool4.test | 2 +-
tests/libtool5.test | 2 +-
tests/libtool6.test | 2 +-
tests/libtool7.test | 2 +-
tests/libtool8.test | 2 +-
tests/libtool9.test | 2 +-
tests/license.test | 2 +-
tests/license2.test | 2 +-
tests/link_c_cxx.test | 2 +-
tests/link_dist.test | 2 +-
tests/link_f90_only.test | 2 +-
tests/link_f_only.test | 2 +-
tests/link_fc.test | 2 +-
tests/link_fccxx.test | 2 +-
tests/link_fcxx.test | 2 +-
tests/lisp2.test | 2 +-
tests/lisp3.test | 2 +-
tests/lisp4.test | 2 +-
tests/lisp5.test | 2 +-
tests/lisp6.test | 2 +-
tests/lisp7.test | 2 +-
tests/lisp8.test | 2 +-
tests/listval.test | 2 +-
tests/location.test | 2 +-
tests/longlin2.test | 2 +-
tests/longline.test | 2 +-
tests/ltcond.test | 2 +-
tests/ltcond2.test | 2 +-
tests/ltconv.test | 2 +-
tests/ltdeps.test | 2 +-
tests/ltinstloc.test | 2 +-
tests/ltlibobjs.test | 2 +-
tests/ltlibsrc.test | 2 +-
tests/ltorder.test | 2 +-
tests/lzma.test | 2 +-
tests/maintclean.test | 2 +-
tests/make.test | 2 +-
tests/makej.test | 2 +-
tests/{check11.test => makej2.test} | 37 +-
tests/maken.test | 2 +-
tests/maken2.test | 2 +-
tests/maken3.test | 2 +-
tests/maken4.test | 2 +-
tests/makevars.test | 2 +-
tests/man.test | 2 +-
tests/man2.test | 2 +-
tests/man3.test | 2 +-
tests/man4.test | 2 +-
tests/man5.test | 2 +-
tests/mclean.test | 2 +-
tests/mdate.test | 2 +-
tests/mdate2.test | 2 +-
tests/mdate3.test | 2 +-
tests/mdate4.test | 2 +-
tests/mdate5.test | 2 +-
tests/missing.test | 2 +-
tests/missing2.test | 2 +-
tests/missing3.test | 2 +-
tests/missing4.test | 2 +-
tests/missing5.test | 2 +-
tests/missing6.test | 2 +-
tests/mkinst2.test | 2 +-
tests/mkinst3.test | 2 +-
tests/mkinstall.test | 2 +-
tests/mmode.test | 2 +-
tests/mmodely.test | 2 +-
tests/multlib.test | 2 +-
tests/nobase-libtool.test | 2 +-
tests/nobase-python.test | 2 +-
tests/nobase.test | 2 +-
tests/nodef.test | 2 +-
tests/nodef2.test | 2 +-
tests/nodep.test | 2 +-
tests/nodep2.test | 2 +-
tests/nodepcomp.test | 2 +-
tests/nodist.test | 2 +-
tests/nodist2.test | 2 +-
tests/nodist3.test | 2 +-
tests/nogzip.test | 2 +-
tests/nogzip2.test | 2 +-
tests/noinst.test | 2 +-
tests/noinstdir.test | 2 +-
tests/nolink.test | 2 +-
tests/nostdinc.test | 2 +-
tests/notrans.test | 2 +-
tests/number.test | 2 +-
tests/objc.test | 2 +-
tests/objc2.test | 2 +-
tests/obsolete.test | 2 +-
tests/order.test | 2 +-
tests/outdir.test | 2 +-
tests/output-order.test | 2 +-
tests/output.test | 2 +-
tests/output10.test | 2 +-
tests/output11.test | 2 +-
tests/output12.test | 2 +-
tests/output13.test | 2 +-
tests/output2.test | 2 +-
tests/output3.test | 2 +-
tests/output4.test | 2 +-
tests/output5.test | 2 +-
tests/output6.test | 2 +-
tests/output7.test | 2 +-
tests/output8.test | 2 +-
tests/output9.test | 2 +-
tests/overrid.test | 2 +-
tests/parallel-am.test | 2 +-
tests/parallel-am2.test | 2 +-
tests/parallel-am3.test | 2 +-
tests/parallel-tests.test | 2 +-
...{parallel-tests6.test => parallel-tests10.test} | 22 +-
tests/parallel-tests2.test | 2 +-
tests/parallel-tests3.test | 2 +-
tests/parallel-tests4.test | 2 +-
tests/parallel-tests5.test | 2 +-
tests/parallel-tests6.test | 3 +-
tests/parallel-tests7.test | 2 +-
tests/parallel-tests8.test | 2 +-
tests/parallel-tests9.test | 2 +-
tests/parse.test | 2 +-
tests/percent.test | 2 +-
tests/percent2.test | 2 +-
tests/phony.test | 2 +-
tests/pluseq.test | 2 +-
tests/pluseq10.test | 2 +-
tests/pluseq2.test | 2 +-
tests/pluseq3.test | 2 +-
tests/pluseq4.test | 2 +-
tests/pluseq5.test | 2 +-
tests/pluseq6.test | 2 +-
tests/pluseq7.test | 2 +-
tests/pluseq8.test | 2 +-
tests/pluseq9.test | 2 +-
tests/postproc.test | 2 +-
tests/ppf77.test | 2 +-
tests/pr2.test | 2 +-
tests/pr204.test | 2 +-
tests/pr211.test | 2 +-
tests/pr220.test | 2 +-
tests/pr224.test | 2 +-
tests/pr229.test | 2 +-
tests/pr243.test | 2 +-
tests/pr266.test | 2 +-
tests/pr279-2.test | 2 +-
tests/pr279.test | 2 +-
tests/pr287.test | 2 +-
tests/pr300-lib.test | 2 +-
tests/pr300-ltlib.test | 2 +-
tests/pr300-prog.test | 2 +-
tests/pr307.test | 2 +-
tests/pr401.test | 2 +-
tests/pr401b.test | 2 +-
tests/pr401c.test | 2 +-
tests/pr72.test | 2 +-
tests/pr87.test | 2 +-
tests/pr9.test | 2 +-
tests/prefix.test | 2 +-
tests/primary.test | 2 +-
tests/primary2.test | 2 +-
tests/primary3.test | 2 +-
tests/proginst.test | 2 +-
tests/python.test | 2 +-
tests/python10.test | 2 +-
tests/python11.test | 2 +-
tests/python12.test | 2 +-
tests/python2.test | 2 +-
tests/python3.test | 2 +-
tests/python4.test | 2 +-
tests/python5.test | 2 +-
tests/python6.test | 2 +-
tests/python7.test | 2 +-
tests/python8.test | 2 +-
tests/python9.test | 2 +-
tests/recurs.test | 2 +-
tests/recurs2.test | 2 +-
tests/regex.test | 2 +-
tests/remake.test | 2 +-
tests/remake2.test | 2 +-
tests/remake3.test | 2 +-
tests/remake4.test | 2 +-
tests/remake5.test | 2 +-
tests/remake6.test | 2 +-
tests/remake7.test | 2 +-
tests/req.test | 2 +-
tests/reqd.test | 2 +-
tests/reqd2.test | 2 +-
tests/rulepat.test | 2 +-
tests/sanity.test | 2 +-
tests/scripts.test | 2 +-
tests/seenc.test | 2 +-
tests/silent.test | 2 +-
tests/silent2.test | 2 +-
tests/silent3.test | 2 +-
tests/silent4.test | 2 +-
tests/silent5.test | 2 +-
tests/silent6.test | 2 +-
tests/silent7.test | 2 +-
tests/sinclude.test | 2 +-
tests/space.test | 2 +-
tests/specflg.test | 2 +-
tests/specflg10.test | 3 +-
tests/specflg2.test | 2 +-
tests/specflg3.test | 2 +-
tests/specflg6.test | 2 +-
tests/specflg7.test | 2 +-
tests/specflg8.test | 2 +-
tests/specflg9.test | 2 +-
tests/spell.test | 2 +-
tests/spell2.test | 2 +-
tests/spell3.test | 2 +-
tests/spelling.test | 2 +-
tests/spy.test | 2 +-
tests/srcsub.test | 2 +-
tests/srcsub2.test | 2 +-
tests/stamph2.test | 2 +-
tests/stdinc.test | 2 +-
tests/stdlib.test | 2 +-
tests/stdlib2.test | 2 +-
tests/strip.test | 2 +-
tests/subcond.test | 2 +-
tests/subcond2.test | 2 +-
tests/subcond3.test | 2 +-
tests/subdir.test | 2 +-
tests/subdir2.test | 2 +-
tests/subdir3.test | 2 +-
tests/subdir4.test | 2 +-
tests/subdir5.test | 2 +-
tests/subdir6.test | 2 +-
tests/subdir7.test | 2 +-
tests/subdir8.test | 2 +-
tests/subdir9.test | 2 +-
tests/subdirbuiltsources.test | 2 +-
tests/subobj.test | 2 +-
tests/subobj10.test | 2 +-
tests/subobj2.test | 2 +-
tests/subobj3.test | 2 +-
tests/subobj4.test | 2 +-
tests/subobj5.test | 2 +-
tests/subobj6.test | 2 +-
tests/subobj7.test | 2 +-
tests/subobj8.test | 2 +-
tests/subobj9.test | 2 +-
tests/subobjname.test | 2 +-
tests/subpkg.test | 2 +-
tests/subpkg2.test | 2 +-
tests/subpkg3.test | 2 +-
tests/{subpkg3.test => subpkg4.test} | 32 +-
tests/subst.test | 2 +-
tests/subst2.test | 2 +-
tests/subst3.test | 2 +-
tests/subst4.test | 2 +-
tests/substre2.test | 2 +-
tests/substref.test | 2 +-
tests/substtarg.test | 2 +-
tests/suffix.test | 2 +-
tests/suffix10.test | 2 +-
tests/suffix11.test | 2 +-
tests/suffix12.test | 2 +-
tests/suffix2.test | 2 +-
tests/suffix3.test | 2 +-
tests/suffix4.test | 2 +-
tests/suffix5.test | 2 +-
tests/suffix6.test | 2 +-
tests/suffix7.test | 2 +-
tests/suffix8.test | 2 +-
tests/suffix9.test | 2 +-
tests/symlink.test | 2 +-
tests/symlink2.test | 2 +-
tests/symlink3.test | 2 +-
tests/syntax.test | 2 +-
tests/tags.test | 2 +-
tests/tagsub.test | 2 +-
tests/tar.test | 2 +-
tests/tar2.test | 2 +-
tests/tar3.test | 2 +-
tests/target-cflags.test | 2 +-
tests/targetclash.test | 2 +-
tests/transform.test | 2 +-
tests/transform2.test | 2 +-
tests/txinfo.test | 2 +-
tests/txinfo10.test | 2 +-
tests/txinfo13.test | 2 +-
tests/txinfo16.test | 2 +-
tests/txinfo17.test | 2 +-
tests/txinfo18.test | 2 +-
tests/txinfo19.test | 2 +-
tests/txinfo2.test | 2 +-
tests/txinfo20.test | 2 +-
tests/txinfo21.test | 2 +-
tests/txinfo22.test | 2 +-
tests/txinfo23.test | 2 +-
tests/txinfo24.test | 2 +-
tests/txinfo25.test | 2 +-
tests/txinfo26.test | 2 +-
tests/txinfo27.test | 2 +-
tests/txinfo28.test | 2 +-
tests/txinfo29.test | 2 +-
tests/txinfo3.test | 2 +-
tests/txinfo30.test | 2 +-
tests/txinfo31.test | 2 +-
tests/txinfo32.test | 2 +-
tests/txinfo33.test | 2 +-
tests/txinfo4.test | 2 +-
tests/txinfo5.test | 2 +-
tests/txinfo6.test | 2 +-
tests/txinfo7.test | 2 +-
tests/txinfo8.test | 2 +-
tests/txinfo9.test | 2 +-
tests/unused.test | 2 +-
tests/upc.test | 2 +-
tests/upc2.test | 2 +-
tests/upc3.test | 2 +-
tests/vala.test | 2 +-
tests/vala1.test | 2 +-
tests/vala2.test | 14 +-
tests/vala3.test | 4 +-
tests/vala4.test | 2 +-
tests/vala5.test | 10 +-
tests/vars.test | 2 +-
tests/vars3.test | 2 +-
tests/vartar.test | 2 +-
tests/version.test | 2 +-
tests/version2.test | 2 +-
tests/version3.test | 2 +-
tests/version4.test | 2 +-
tests/version6.test | 2 +-
tests/version7.test | 2 +-
tests/version8.test | 2 +-
tests/vpath.test | 2 +-
tests/vtexi.test | 2 +-
tests/vtexi2.test | 2 +-
tests/warnopts.test | 2 +-
tests/werror.test | 2 +-
tests/werror2.test | 2 +-
tests/whoami.test | 2 +-
tests/xsource.test | 2 +-
tests/xz.test | 2 +-
tests/yacc.test | 2 +-
tests/yacc2.test | 2 +-
tests/yacc3.test | 2 +-
tests/yacc4.test | 2 +-
tests/yacc5.test | 2 +-
tests/yacc6.test | 2 +-
tests/yacc7.test | 2 +-
tests/yacc8.test | 2 +-
tests/yaccpp.test | 2 +-
tests/yaccvpath.test | 2 +-
826 files changed, 1882 insertions(+), 1706 deletions(-)
copy tests/{check11.test => gcj6.test} (61%)
copy tests/{check11.test => makej2.test} (61%)
copy tests/{parallel-tests6.test => parallel-tests10.test} (76%)
copy tests/{subpkg3.test => subpkg4.test} (54%)
diff --git a/COPYING b/COPYING
index 94a9ed0..d511905 100644
--- a/COPYING
+++ b/COPYING
@@ -1,626 +1,285 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
this License.
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change
under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This program is free software: you can redistribute it and/or modify
+ This 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 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full
notice is found.
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 <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index 6ad0409..14756d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,276 @@
+2009-05-24 Jack Kelly <address@hidden> (tiny change)
+ Ralf Wildenhues <address@hidden>
+
+ AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
+ * tests/gcj6.test: New test.
+ * tests/Makefile.am: Update; mark gcj6.test as XFAIL.
+ * THANKS: Update.
+
+2009-05-24 Ralf Wildenhues <address@hidden>
+
+ parallel-tests: avoid GNU make 3.80 substitution bug.
+ * lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any
+ `.log' entries from `$(TEST_LOGS)' even if the list is nonempty,
+ to work around GNU make 3.80 substitution reference issue with
+ trailing white space in the variable.
+ * tests/parallel-tests10.test: New test.
+ * tests/parallel-tests6.test: Update comment.
+ * tests/Makefile.am: Update.
+ * NEWS: Update.
+ Report by Bob Friesenhahn.
+
+2009-05-23 Ralf Wildenhues <address@hidden>
+
+ testsuite: unset installation directory variables.
+ * tests/defs.in: Before test execution, be sure to unset all
+ installation directory variables, so they cannot have an effect
+ on a `make -e install' command within a test.
+ Report by Dagobert Michelsen.
+
+ testsuite: do not change the mode of installed Libtool files.
+ * tests/defs.in: Do not use `chmod -R' on the test directory, as
+ that may change or try to change the mode of installed files:
+ the test directory may contain symlinks to ltmain.sh files from
+ a Libtool installation, and Solaris `chmod -R' touches symlink
+ targets. Instead, use the cleanup strategy used in distdir.am.
+ * NEWS: Update.
+ Report by Dagobert Michelsen.
+
+ testsuite: do not fail in cleanup code.
+ * tests/defs.in: Turn off errexit in the cleanup trap, to avoid
+ a test failure due to a nonzero command.
+ * THANKS: Update.
+ Report by Dagobert Michelsen.
+
+2009-05-23 Peter O'Gorman <address@hidden>
+
+ python: do not install in system directories on Darwin 9.
+ On Darwin 9, get_python_lib returns a path below `/Library/Python'
+ regardless of the `prefix' argument it was passed, causing `make
+ install' to target the system directories regardless of `--prefix'
+ argument used. Work around this Darwin bug by ignoring the result
+ of get_python_lib if it points outside of the passed prefix, and
+ the prefix was not a system directory.
+ * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
+ initial portion of the pythondir returned by get_python_lib, then
+ ignore it unless the configured prefix is `/usr' or starts with
+ `/System'. Fixes instmany-python.test failure on Mac OS X 10.5.7.
+ * NEWS: Update.
+
+2009-05-23 Ralf Wildenhues <address@hidden>
+
+ Clarify how to enable `silent-rules' and other global options.
+ * doc/automake.texi (Options): When introducing options, be more
+ careful to note that not all of them can be specified in
+ AUTOMAKE_OPTIONS statements, and that some do not make sense in
+ subdirectories. Note more prominently that `silent-rules' can
+ only be specified in configure.ac.
+ * lib/Automake/Options.pm (_process_option_list): Improve error
+ message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
+ options specified in Makefile.am files.
+ Report by Bruno Haible.
+
+2009-05-21 Ralf Wildenhues <address@hidden>
+
+ Skip specflg10.test without a C++ compiler.
+ * tests/specflg10.test: Require g++.
+ Report by Thien-Thi Nguyen.
+
+2009-05-19 Ralf Wildenhues <address@hidden>
+
+ Revert last patch, IRIX has an editor named `jot'.
+ * tests/instmany-mans.test: Do not try `jot'.
+ * tests/instmany-python.test: Likewise.
+ * tests/instmany.test: Likewise.
+ Report by Peter O'Gorman.
+
+2009-05-18 Ralf Wildenhues <address@hidden>
+
+ testsuite: also try `jot' as `seq' replacement.
+ * tests/instmany-mans.test: Try BSD `jot' before resorting to a
+ slow but portable shell loop.
+ * tests/instmany-python.test: Likewise.
+ * tests/instmany.test: Likewise.
+ Suggestion by Peter O'Gorman.
+
+ Fix test failure when pkg.m4 is not found, only pkg-config.
+ * tests/vala5.test: Update comment, this test is not expected to
+ fail any more. Require valac version 0.7.0. Skip if configure
+ fails, could be due to unexpanded PKG_CHECK_MODULES or too old
+ valac.
+ Report by Simon Josefsson.
+
+2009-05-17 Ralf Wildenhues <address@hidden>
+
+ Post-release version bump.
+ * configure.ac, NEWS: Bump version to 1.11a.
+
+2009-05-17 Ralf Wildenhues <address@hidden>
+
+ Automake 1.11.
+ * configure.ac: Bump version to 1.11.
+ * doc/automake.texi (Releases): Add line for 1.11. Remove line
+ for 1.10b.
+
+ Fix maintainer-check failures.
+ * automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
+ of plain `cd'.
+ * tests/vala2.test: Use `rm -f' instead of `rm'.
+
+ Revert Automake license to GPLv2+.
+ Automake will move to GPLv3+ once the Exception statement has
+ been rewritten to use the new GPLv3 exception language. This
+ change does not impact the COPYING file that may be installed
+ by `automake --add-missing'.
+ * COPYING: Revert to GPLv2. All uses changed.
+ * NEWS: Update.
+
+ Rewrite NEWS for 1.11.
+ * NEWS: Rewrite, merging 1.10b and 1.10c entries.
+
+ Sync auxiliary files from upstream.
+ * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
+ upstream.
+
+ Update release statistics, improve release-stats rule.
+ * Makefile.am (release-stats): Output stderr of pstops in
+ addition to catching it, for better debugging.
+ * doc/automake.texi (Releases): Add line for 1.10.2.
+
+ Cope with parallel BSD make -jN semantics.
+ When BSD `make -jN' is used without `-B' which enables backwards
+ compatible semantics, it may reuse the same shell for several
+ commands within a rule; so ensure we do not leave it in a
+ different directory, nor `exit 0' early in a multi-command rule.
+ * lib/am/distdir.am (distcheck): After running `distcleancheck',
+ change back to original working directory.
+ * lib/am/remake-hdr.am (%CONFIG_HIN%): Run autoheader in a
+ subshell.
+ * lib/am/mans.am (uninstall-man%SECTION%): Do not `exit 0' early
+ in a rule that consists of several shell invocations. Parallel
+ NetBSD `make -jN' without `-B' will use only one shell for all
+ commands, but won't respawn one after `exit 0'. Fixes
+ notrans.test failure.
+ * tests/makej2.test: New test.
+ * tests/Makefile.am: Update.
+
+ Fix typo in comment.
+ * lib/am/install.am: Fix typo.
+
+2009-05-17 Matthias Klose <address@hidden> (tiny change)
+ Ralf Wildenhues <address@hidden>
+
+ Let AM_PATH_PYTHON honor python's idea about the site directory.
+ * m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and
+ pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix'
+ to get_python_lib, so python can determine the name of the site
+ directory depending on the install location. Afterwards, replace
+ the directory names with the unexpanded values of $PYTHON_PREFIX
+ resp. $PYTHON_EXEC_PREFIX again, to allow override according to
+ the documentation. Fixes site directory computation for Debian
+ and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local',
+ `site-packages' elsewhere).
+ * NEWS, THANKS: Update.
+
+2009-05-17 Ralf Wildenhues <address@hidden>
+
+ Vala: for now, require GNU make.
+ * doc/automake.texi (Vala Support): GNU make is currently
+ required for Vala sources.
+ * tests/vala2.test, tests/vala3.test, tests/vala5.test: Require
+ GNU make.
+
+2009-05-17 Jürg Billeter <address@hidden>
+
+ Vala: Use $(srcdir) in rebuild rules.
+ valac is always run in srcdir as the generated files are distributed.
+ So srcdir needs to be taken into account in the rebuild rules to not
+ wrongly trigger a rebuild in the wrong directory.
+ * automake.in (lang_vala_finish_target): Rebuild files in
+ $(srcdir).
+ * tests/vala2.test: Test rebuild rules from VPATH build.
+
+ Vala: Add and test rebuild rules for generated header and vapi files.
+ valac will generate additional files when using, for example, -H in
+ VALAFLAGS. We need to recognize these options and add appropriate
+ rebuild rules to fix parallel build.
+ * automake.in (lang_vala_finish_target): Recognize -H, -h,
+ --header, --internal-header, --vapi, --internal-api, --gir flags
+ to valac and rebuild rules for generated headers; distribute
+ and maintainer-clean them.
+ * tests/vala2.test: Test rebuild rules.
+
+2009-05-17 Jürg Billeter <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ Vala: Fix build when using per-target VALAFLAGS.
+ This does not yet implement full per-target support for VALAFLAGS,
+ however, this change at least fixes building when there is only one
+ target per source file, which is the most common situation.
+ * automake.in: Remove `VALAFLAGS' from `flags' in language struct.
+ (lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually
+ here; check `VALAFLAGS' user variables.
+ * tests/Makefile.am (XFAIL_TESTS): Remove vala5.test.
+ * doc/automake.texi (Vala Support): Document per-target flag
+ limitations.
+
+2009-05-11 Ralf Wildenhues <address@hidden>
+
+ For PR automake/540:
+ Document some formatting restrictions for Makefile.am files.
+ * doc/automake.texi (General Operation, Usage of Conditionals):
+ Variable assignments should not be indented by TABs, rule commands
+ should. Conditional keyword statements should not be indented.
+ * THANKS: Update.
+ Report by Luo Yi.
+
+2009-05-03 Ralf Wildenhues <address@hidden>
+
+ Fix copyright years in *.am files.
+ * lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
+ lib/am/program.am, lib/am/tags.am: Fix copyright years.
+
+ distdir: avoid duplicate `find' traversal with subpackages.
+ * lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
+ `am__skip_mode_fix'.
+ [%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
+ walk.
+ * tests/subpkg4.test: New test, to ensure that we still walk the
+ whole tree while fixing permissions. We don't ensure it is
+ walked once only.
+ * tests/Makefile.am: Update.
+
+ Disable test cleanup trap with OSF1/Tru64 sh.
+ * configure.ac: Test whether /bin/sh has working 'set -e'
+ in conjunction with an exit trap. Set $am_cv_sh_errexit_works
+ accordingly, substitute sh_errexit_works, and warn about
+ leftover test directories with broken shells like Tru64 /bin/sh.
+ * tests/defs.in: Do not install any traps with broken shells.
+
+2009-05-02 Bruno Haible <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ Recommend *-local hooks without commands, for extensibility.
+ * doc/automake.texi (Clean): Show how to write the clean-local
+ extension with separate phony target.
+ * tests/Makefile.am (clean-local-check): Practice what we preach
+ by marking this phony. For consistency, rename from ...
+ (check-clean-local): ... this.
+
+2009-04-28 Eric Blake <address@hidden>
+
+ scripts: normalize all timestamps to UTC
+ * lib/compile (scriptversion): Update emacs hook.
+ * lib/depcomp (scriptversion): Likewise.
+ * lib/elisp-comp (scriptversion): Likewise.
+ * lib/gnupload (scriptversion): Likewise.
+ * lib/install-sh (scriptversion): Likewise.
+ * lib/mdate-sh (scriptversion): Likewise.
+ * lib/missing (scriptversion): Likewise.
+ * lib/mkinstalldirs (scriptversion): Likewise.
+ * lib/py-compile (scriptversion): Likewise.
+ * lib/ylwrap (scriptversion): Likewise.
+
2009-04-27 Ralf Wildenhues <address@hidden>
silent-rules: fix alignment of less verbose output.
diff --git a/HACKING b/HACKING
index f9a3c05..64d55f9 100644
--- a/HACKING
+++ b/HACKING
@@ -192,7 +192,7 @@ Copyright (C) 2003, 2007, 2008 Free Software Foundation,
Inc.
This 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 3, or (at your option)
+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,
diff --git a/Makefile.am b/Makefile.am
index af9147b..d082a3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
## This 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 3, or (at your option)
+## 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,
@@ -545,6 +545,7 @@ release-stats: ps
m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
doc_text=`cd doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
+ echo "$$doc_text" && \
rm -f doc/unused.ps && \
doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\)
pages.*/\1/p'` && \
tests="tests/*.test"; \
diff --git a/Makefile.in b/Makefile.in
index 34193e8..23692ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -210,6 +210,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -551,13 +552,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -565,7 +567,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -635,6 +638,7 @@ distcheck: dist
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
@@ -657,7 +661,9 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -1166,6 +1172,7 @@ release-stats: ps
m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
doc_text=`cd doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
+ echo "$$doc_text" && \
rm -f doc/unused.ps && \
doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\)
pages.*/\1/p'` && \
tests="tests/*.test"; \
diff --git a/NEWS b/NEWS
index e806cf6..10b6f61 100644
--- a/NEWS
+++ b/NEWS
@@ -1,57 +1,25 @@
-New in 1.10c:
+New in 1.11a:
-* Languages changes:
-
- - There is initial support for the Vala programming language, when using
- Vala 0.7.0 or later.
-
-* Miscellaneous Changes:
-
- - In 1.10b, the `parallel-tests' driver introduced per-extension test
- driver variables `<EXT>_LOG_COMPILER', defined as
-
- $(<EXT>_LOG_COMPILE) $(AM_<EXT>_LOG_FLAGS) $(<EXT>_LOG_FLAGS)
-
- for extensions `.ext' registered in `TEST_EXTENSIONS'. Now, for tests
- without a known extension, add `LOG_COMPILER', defined as
-
- $(LOG_COMPILE) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-
- to the rules.
-
- - The new `parallel-tests' targets `recheck' and `recheck-html' will not run
- any tests that have not run yet.
+Bugs fixed in 1.11a:
- - The `silent-rules' mode introduces a configure-time `--enable-silent-rules'
- option to specify the default build verbosity; it can still be overridden
- with an explicit `make V=[0|1]'. The configure switch necessitated to
- remove the automake command-line switch `--silent-rules' and
per-Makefile.am
- settings `AUTOMAKE_OPTIONS = silent-rules', so the feature needs to be
- enabled in configure.ac now, either by adding the `silent-rules' option
- to `AM_INIT_AUTOMAKE', or by calling the new `AM_SILENT_RULES' macro.
+* Bugs introduced by 1.11:
-Bugs fixed in 1.10c:
+ - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+ trailing white space in the test list (`TESTS = foo $(EMPTY)').
* Long standing bugs:
- - Texinfo dvi, ps, pdf, and html output files are not removed upon
- `make mostlyclean' any more; only the LaTeX by-products are.
-
- - Renamed objects also work with the `subdir-objects' option and
- source file languages which Automake does not know itself.
+ - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
+ even if the `--prefix' argument pointed outside of a system directory.
+ AM_PATH_PYTHON has been fixed to ignore the value returned from python's
+ `get_python_lib' function if it points outside the configured prefix,
+ unless the `--prefix' argument was either `/usr' or below `/System'.
- - `automake' now correctly complains about variable assignments which are
- preceded by a comment, extend over multiple lines with backslash-escaped
- newlines, and end in a comment sign. Previous versions would silently
- and wrongly ignore such assignments completely.
-
-* Bugs introduced by 1.10:
-
- - The `parallel-tests' driver also works on systems with a nonempty
- executable extension, such as Windows.
+ - The testsuite does not try to change the mode of `ltmain.sh' files from
+ a Libtool installation (symlinked to test directories) any more.
-New in 1.10b:
+New in 1.11:
* Version requirements:
@@ -89,11 +57,16 @@ New in 1.10b:
- Files with extension .sx are also treated as preprocessed assembler.
+ - The default source file extension (.c) can be overridden with
+ AM_DEFAULT_SOURCE_EXT now.
+
- Python 3.0 is supported now, Python releases prior to 2.0 are no
longer supported.
- - The default source file extension (.c) can be overridden with
- AM_DEFAULT_SOURCE_EXT now.
+ - AM_PATH_PYTHON honors python's idea about the site directory.
+
+ - There is initial support for the Vala programming language, when using
+ Vala 0.7.0 or later.
* Miscellaneous changes:
@@ -109,11 +82,11 @@ New in 1.10b:
- "make dist" can now create xz-compressed tarballs,
as well as (deprecated?) lzma-compressed tarballs.
- - Automake is licensed under GPLv3+. `automake --add-missing' will
- by default install the GPLv3 file as COPYING if it is missing.
- It will also warn that the license file should be added to source
- control. Note that Automake will never overwrite an existing COPYING
- file, even when the `--force-missing' option is used.
+ - `automake --add-missing' will by default install the GPLv3 file as
+ COPYING if it is missing. It will also warn that the license file
+ should be added to source control. Note that Automake will never
+ overwrite an existing COPYING file, even when the `--force-missing'
+ option is used.
- The manual is now distributed under the terms of the GNU FDL 1.3.
@@ -171,16 +144,21 @@ New in 1.10b:
- The `parallel-tests' option enables a new test driver that allows for
parallel test execution, inter-test dependencies, lazy test execution
- for unit-testing, and formatted result output as RST (reStructuredText)
- and HTML. Enabling this option may require some changes to your test
- suite setup; see the manual for details.
+ for unit-testing, re-testing only failed tests, and formatted result output
+ as RST (reStructuredText) and HTML. Enabling this option may require some
+ changes to your test suite setup; see the manual for details.
- The `silent-rules' option enables Linux kernel-style silent build output.
This option requires the widely supported but non-POSIX `make' feature
of recursive variable expansion, so do not use it if your package needs
to build with `make' implementations that do not support it.
- Besides the normal option setting methods, it can also be enabled
- globally by the new automake option `--silent-rules'.
+
+ To enable less verbose build output, the developer has to use the Automake
+ option `silent-rules' in `AM_INIT_AUTOMAKE', or call the `AM_SILENT_RULES'
+ macro. The user may then set the default verbosity by passing the
+ `--enable-silent-rules' option to `configure'. At `make' run time, this
+ default may be overridden using `make V=0' for less verbose, and `make V=1'
+ for backward-compatible verbose output.
- New prefix `notrans_' for manpages which should not be transformed
by --program-transform.
@@ -209,7 +187,7 @@ New in 1.10b:
undocumented variables may be used in several documented macros such
as $(AUTOCONF) or $(MAKEINFO).
-Bugs fixed in 1.10b:
+Bugs fixed in 1.11:
* Long standing bugs:
@@ -255,6 +233,17 @@ Bugs fixed in 1.10b:
- `make distcheck' works also when both a directory and some file below it
have been added to a distribution variable, such as EXTRA_DIST or
*_SOURCES.
+ - Texinfo dvi, ps, pdf, and html output files are not removed upon
+ `make mostlyclean' any more; only the LaTeX by-products are.
+
+ - Renamed objects also work with the `subdir-objects' option and
+ source file languages which Automake does not know itself.
+
+ - `automake' now correctly complains about variable assignments which are
+ preceded by a comment, extend over multiple lines with backslash-escaped
+ newlines, and end in a comment sign. Previous versions would silently
+ and wrongly ignore such assignments completely.
+
* Bugs introduced by 1.10:
- Fix output of dummy dependency files in presence of post-processed
@@ -1505,7 +1494,7 @@ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003,
This 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 3, or (at your option)
+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,
diff --git a/README b/README
index 0e23237..de361be 100644
--- a/README
+++ b/README
@@ -48,7 +48,7 @@ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2003
This 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 3, or (at your option)
+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,
diff --git a/THANKS b/THANKS
index 2017bcb..852f244 100644
--- a/THANKS
+++ b/THANKS
@@ -58,6 +58,7 @@ Chris Provenzano address@hidden
Christian Cornelssen address@hidden
Claudio Fontana address@hidden
Clifford Wolf address@hidden
+Dagobert Michelsen address@hidden
Dalibor Topic address@hidden
danbp address@hidden
Daniel Jacobowitz address@hidden
@@ -128,6 +129,7 @@ Ian Lance Taylor address@hidden
ÐлÑÑ Ð. ÐолÑбев address@hidden
Imacat address@hidden
Inoue address@hidden
+Jack Kelly address@hidden
James Amundson address@hidden
James Henstridge address@hidden
James R. Van Zandt address@hidden
@@ -187,6 +189,7 @@ Laurent Morichetti address@hidden
Leo Davis address@hidden
Leonardo Boiko address@hidden
Loulou Pouchet address@hidden
+Luo Yi address@hidden
Maciej Stachowiak address@hidden
Maciej W. Rozycki address@hidden
Manu Rouat address@hidden
@@ -212,6 +215,7 @@ Matt Leach address@hidden
Matthew D. Langston address@hidden
Matthias Andree address@hidden
Matthias Clasen address@hidden
+Matthias Klose address@hidden
Maxim Sinev address@hidden
Merijn de Jonge address@hidden
Michael Brantley address@hidden
diff --git a/TODO b/TODO
index 3a1e907..0c28f49 100644
--- a/TODO
+++ b/TODO
@@ -565,7 +565,7 @@ Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002,
This 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 3, or (at your option)
+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,
diff --git a/aclocal.in b/aclocal.in
index cc52528..a5cee39 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -12,7 +12,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# This 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 3, or (at your option)
+# 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,
@@ -908,7 +908,7 @@ sub version()
print <<EOF;
aclocal (GNU $PACKAGE) $VERSION
Copyright (C) 2009 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/aclocal.m4 b/aclocal.m4
index d085be5..ce1fac8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10c -*- Autoconf -*-
+# generated automatically by aclocal 1.11a -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
diff --git a/automake.in b/automake.in
index 20ef3bd..bab8c42 100755
--- a/automake.in
+++ b/automake.in
@@ -12,7 +12,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S
"$0" "$@";; esac'
# This 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 3, or (at your option)
+# 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,
@@ -815,7 +815,7 @@ register_language ('name' => 'header',
register_language ('name' => 'vala',
'Name' => 'Vala',
'config_vars' => ['VALAC'],
- 'flags' => ['VALAFLAGS'],
+ 'flags' => [],
'compile' => '$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)',
'ccer' => 'VALAC',
'compiler' => 'VALACOMPILE',
@@ -5942,26 +5942,53 @@ sub lang_vala_finish_target ($$)
{
foreach my $file ($var->value_as_list_recursive)
{
- $output_rules .= "$file: ${derived}_vala.stamp\n".
+ $output_rules .= "\$(srcdir)/$file:
\$(srcdir)/${derived}_vala.stamp\n".
"address@hidden test -f \$@; then :; else \\\n".
- "\t rm -f ${derived}_vala.stamp; \\\n".
- "\t \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
+ "\t rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
+ "\t \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS)
${derived}_vala.stamp; \\\n".
"\tfi\n"
if $file =~ s/(.*)\.vala$/$1.c/;
}
}
- my $compile = $self->compile;
-
- # Rewrite each occurrence of `AM_$flag' in the compile
- # rule into `${derived}_$flag' if it exists.
- for my $flag (@{$self->flags})
+ # Add rebuild rules for generated header and vapi files
+ my $flags = var ($derived . '_VALAFLAGS');
+ if ($flags)
{
- my $val = "${derived}_$flag";
- $compile =~ s/\(AM_$flag\)/\($val\)/
- if set_seen ($val);
+ my $lastflag = '';
+ foreach my $flag ($flags->value_as_list_recursive)
+ {
+ if (grep (/$lastflag/, ('-H', '-h', '--header', '--internal-header',
+ '--vapi', '--internal-vapi', '--gir')))
+ {
+ my $headerfile = $flag;
+ $output_rules .= "\$(srcdir)/$headerfile:
\$(srcdir)/${derived}_vala.stamp\n".
+ "address@hidden test -f \$@; then :; else \\\n".
+ "\t rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
+ "\t \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS)
${derived}_vala.stamp; \\\n".
+ "\tfi\n";
+
+ # valac is not used when building from dist tarballs
+ # distribute the generated files
+ push_dist_common ($headerfile);
+ $clean_files{$headerfile} = MAINTAINER_CLEAN;
+ }
+ $lastflag = $flag;
+ }
}
+ my $compile = $self->compile;
+
+ # Rewrite each occurrence of `AM_VALAFLAGS' in the compile
+ # rule into `${derived}_VALAFLAGS' if it exists.
+ my $val = "${derived}_VALAFLAGS";
+ $compile =~ s/\(AM_VALAFLAGS\)/\($val\)/
+ if set_seen ($val);
+
+ # VALAFLAGS is a user variable (per GNU Standards),
+ # it should not be overridden in the Makefile...
+ check_user_variables ['VALAFLAGS'];
+
my $dirname = dirname ($name);
# Only generate C code, do not run C compiler
@@ -8353,7 +8380,7 @@ sub version ()
print <<EOF;
automake (GNU $PACKAGE) $VERSION
Copyright (C) 2009 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/bootstrap b/bootstrap
index cb563ca..fff40d5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,7 +8,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/configure b/configure
index e73a0bd..f05818e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for GNU Automake 1.10c.
+# Generated by GNU Autoconf 2.63 for GNU Automake 1.11a.
#
# Report bugs to <address@hidden>.
#
@@ -596,13 +596,14 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNU Automake'
PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.10c'
-PACKAGE_STRING='GNU Automake 1.10c'
+PACKAGE_VERSION='1.11a'
+PACKAGE_STRING='GNU Automake 1.11a'
PACKAGE_BUGREPORT='address@hidden'
ac_unique_file="automake.in"
ac_subst_vars='LTLIBOBJS
LIBOBJS
+sh_errexit_works
FGREP
EGREP
GREP
@@ -1239,7 +1240,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.10c to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.11a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1308,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Automake 1.10c:";;
+ short | recursive ) echo "Configuration of GNU Automake 1.11a:";;
esac
cat <<\_ACEOF
@@ -1375,7 +1376,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Automake configure 1.10c
+GNU Automake configure 1.11a
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1389,7 +1390,7 @@ 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.10c, which was
+It was created by GNU Automake $as_me 1.11a, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1846,7 +1847,7 @@ am_AUTOCONF="${AUTOCONF-autoconf}"
am_AUTOHEADER="${AUTOHEADER-autoheader}"
-am__api_version='1.10c'
+am__api_version='1.11a'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2296,7 +2297,7 @@ fi
# Define the identity of the package.
PACKAGE='automake'
- VERSION='1.10c'
+ VERSION='1.11a'
cat >>confdefs.h <<_ACEOF
@@ -2818,6 +2819,32 @@ $as_echo "$ac_cv_path_FGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether /bin/sh has working 'set -e' with
exit trap" >&5
+$as_echo_n "checking whether /bin/sh has working 'set -e' with exit trap... "
>&6; }
+if test "${am_cv_sh_errexit_works+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if /bin/sh -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
+then
+ am_cv_sh_errexit_works=yes
+else
+ am_cv_sh_errexit_works=no
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_sh_errexit_works" >&5
+$as_echo "$am_cv_sh_errexit_works" >&6; }
+if test $am_cv_sh_errexit_works = no; then
+ { $as_echo "$as_me:$LINENO: WARNING: \`${MAKE-make} check' will leave
leftover directories tests/*.dir" >&5
+$as_echo "$as_me: WARNING: \`${MAKE-make} check' will leave leftover
directories tests/*.dir" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: you can clean them up manually using
\`${MAKE-make} clean' or" >&5
+$as_echo "$as_me: WARNING: you can clean them up manually using \`${MAKE-make}
clean' or" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`cd tests && ${MAKE-make}
clean-local-check'" >&5
+$as_echo "$as_me: WARNING: \`cd tests && ${MAKE-make} clean-local-check'" >&2;}
+ fi
+sh_errexit_works=$am_cv_sh_errexit_works
+
+
ac_config_files="$ac_config_files Makefile doc/Makefile lib/Automake/Makefile
lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile
tests/Makefile tests/defs"
ac_config_files="$ac_config_files tests/aclocal-${APIVERSION}:tests/aclocal.in"
@@ -3281,7 +3308,7 @@ exec 6>&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.10c, which was
+This file was extended by GNU Automake $as_me 1.11a, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3331,7 +3358,7 @@ Report bugs to <address@hidden>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-GNU Automake config.status 1.10c
+GNU Automake config.status 1.11a
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 4229d68..e017678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([GNU Automake], [1.10c], address@hidden)
+AC_INIT([GNU Automake], [1.11a], address@hidden)
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
@@ -171,6 +171,23 @@ AC_SUBST([MODIFICATION_DELAY])
AC_PROG_EGREP
AC_PROG_FGREP
+AC_CACHE_CHECK([whether /bin/sh has working 'set -e' with exit trap],
+[am_cv_sh_errexit_works],
+[if /bin/sh -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
+then
+ am_cv_sh_errexit_works=yes
+else
+ am_cv_sh_errexit_works=no
+fi
+])
+if test $am_cv_sh_errexit_works = no; then
+ AC_MSG_WARN([`${MAKE-make} check' will leave leftover directories
tests/*.dir])
+ AC_MSG_WARN([you can clean them up manually using `${MAKE-make} clean' or])
+ AC_MSG_WARN([`cd tests && ${MAKE-make} clean-local-check'])
+ dnl restore font-lock: `
+fi
+AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
+
AC_CONFIG_FILES([
Makefile
doc/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0a2a076..c794766 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,7 +6,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 189cdfb..bdf68c9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -178,6 +178,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -458,9 +459,9 @@ uninstall-man1:
files=`{ for i in $$list; do echo "$$i"; done; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
diff --git a/doc/automake.texi b/doc/automake.texi
index 324649d..6c6765f 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1775,6 +1775,11 @@ 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.
address@hidden indentation
+Further note that variable assignments should not be indented with
address@hidden characters, use spaces if necessary. On the other hand,
+rule commands should be indented with a leading @key{TAB} character.
+
Automake tries to keep comments grouped with any adjoining rules or
variable definitions.
@@ -6606,7 +6611,8 @@ the @code{_LDFLAGS} variable for the program.
Automake provides initial support for Vala
(@uref{http://www.vala-project.org/}).
-This requires valac version 0.7.0 or later.
+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
@@ -6648,6 +6654,10 @@ libfoo_la_SOURCES = foo.vala
@end example
@end vtable
+Note that currently, you cannot use per-target @code{*_VALAFLAGS}
+(@pxref{Renamed Objects}) to produce different C files from one Vala
+source file.
+
@node Support for Other Languages
@comment node-name, next, previous, up
@@ -8123,6 +8133,17 @@ clean-local:
-rm -rf testSubDir
@end example
+Since @command{make} allows only one set of rules for a given target,
+a more extensible way of writing this is to use a separate target
+listed as a dependency:
+
address@hidden
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+ -rm -rf testSubDir
address@hidden example
+
As the GNU Standards aren't always explicit as to which files should
be removed by which rule, we've adopted a heuristic that we believe
was first formulated by Fran@,{c}ois Pinard:
@@ -8891,13 +8912,18 @@ will now be rerun each time the version number is
bumped, when only
@node Options
@chapter Changing Automake's Behavior
-Various features of Automake can be controlled by options in the
address@hidden Such options are applied on a address@hidden
-basis when listed in a special @file{Makefile} variable named
address@hidden They are applied globally to all processed
address@hidden when listed in the first argument of
address@hidden in @file{configure.ac}. Currently understood
-options are:
+Various features of Automake can be controlled by options. Except where
+noted otherwise, options can be specified in one of several ways: Most
+options can be applied on a address@hidden basis when listed in a
+special @file{Makefile} variable named @code{AUTOMAKE_OPTIONS}. Some
+of these options only make sense when specified in the toplevel
address@hidden file. Options are applied globally to all processed
address@hidden files when listed in the first argument of
address@hidden in @file{configure.ac}, and some options which
+require changes to the @command{configure} script can only be specified
+there. These are annotated below.
+
+Currently understood options are:
@vindex AUTOMAKE_OPTIONS
@table @asis
@@ -9100,6 +9126,9 @@ Call the @code{AM_SILENT_RULES} macro from within the
@file{configure.ac}
file.
@end itemize
+It is not possible to instead specify @option{silent-rules} in a
address@hidden file.
+
@cindex default verbosity for silent-rules
If the developer has done either of the above, then the user of the
package may influence the verbosity at @command{configure} run time as
@@ -9554,7 +9583,9 @@ endif !DEBUG
@end example
@noindent
-Unbalanced conditions are errors.
+Unbalanced conditions are errors. The @code{if}, @code{else}, and
address@hidden statements should not be indented, i.e., start on column
+one.
The @code{else} branch of the above two examples could be omitted,
since assigning the empty string to an otherwise undefined variable
@@ -12750,7 +12781,8 @@ parentheses is the number of generated test cases.
@item 2005-07-10 @tab 1.9.6 @tab 7539 @tab 699 @tab 7867 @tab 3400 (40) @tab
1453 (32) @tab 144 @tab 570
@item 2006-10-15 @tab 1.10 @tab 7859 @tab 1072 @tab 8024 @tab 3512 (40) @tab
1496 (34) @tab 172 @tab 604
@item 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520 (40) @tab
1499 (34) @tab 173 @tab 617
address@hidden 2009-03-29 @tab 1.10b @tab 8556 @tab 1092 @tab 8281 @tab 4106
(41) @tab 1608 (35) @tab 178 @tab 720 (20)
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
@end multitable
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index c05c414..a740603 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 6b79b4f..e94819e 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 129fc98..2d649f6 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -3,7 +3,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 9c24a57..29a184f 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -3,7 +3,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index 855e2db..646fad3 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index ae759e2..ae3abb6 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index facde3f..203c7de 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index a155943..a9c0be7 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 196ed9e..687b987 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 65dec1a..8d94afc 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 90534f1..613dc80 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index ca5471c..077b979 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index f649390..f22bed3 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -197,6 +197,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -497,13 +498,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index ea4e6bb..cacc7d2 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
@@ -279,13 +279,15 @@ sub _process_option_list (\%$@)
elsif ($_ eq 'silent-rules')
{
error ($where,
- "option `$_' must be an argument of AM_INIT_AUTOMAKE")
+ "option `$_' can only be used as argument to
AM_INIT_AUTOMAKE\n"
+ . "but not in AUTOMAKE_OPTIONS makefile statements")
if $where->get !~ /^configure\./;
}
elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
{
error ($where,
- "option `$_' must be an argument of AM_INIT_AUTOMAKE")
+ "option `$_' can only be used as argument to
AM_INIT_AUTOMAKE\n"
+ . "but not in AUTOMAKE_OPTIONS makefile statements")
if $where->get !~ /^configure\./;
for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
{
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 8106def..68b3ea5 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index 3805ef7..20bc106 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
index 504bc45..9745779 100644
--- a/lib/Automake/Struct.pm
+++ b/lib/Automake/Struct.pm
@@ -3,7 +3,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 0b4e60b..d7ba155 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index f826586..1e24bb2 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 1edaef4..8b2a7bc 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 66f260b..09a135a 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -2,7 +2,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 6e5005f..f99a00a 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -3,7 +3,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/Automake/tests/Condition-t.pl
b/lib/Automake/tests/Condition-t.pl
index eb93396..06eb34e 100644
--- a/lib/Automake/tests/Condition-t.pl
+++ b/lib/Automake/tests/Condition-t.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index 27a9067..86f1745 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Automake/tests/DisjConditions-t.pl
b/lib/Automake/tests/DisjConditions-t.pl
index c30b5e2..2fe275b 100644
--- a/lib/Automake/tests/DisjConditions-t.pl
+++ b/lib/Automake/tests/DisjConditions-t.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Automake/tests/DisjConditions.pl
b/lib/Automake/tests/DisjConditions.pl
index 6e18683..47dea83 100644
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am
index b56f3dc..b8fb761 100644
--- a/lib/Automake/tests/Makefile.am
+++ b/lib/Automake/tests/Makefile.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 222f751..12856df 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -213,6 +213,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -385,10 +386,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/lib/Automake/tests/Version.pl b/lib/Automake/tests/Version.pl
index eaf2767..e496435 100644
--- a/lib/Automake/tests/Version.pl
+++ b/lib/Automake/tests/Version.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index d69af4e..8d840fc 100644
--- a/lib/Automake/tests/Wrap.pl
+++ b/lib/Automake/tests/Wrap.pl
@@ -4,7 +4,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f4929e6..f5bd0bc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ee031a9..3a0ede2 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -200,6 +200,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -472,13 +473,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
diff --git a/lib/acinstall b/lib/acinstall
index c99f31b..2bd0bad 100755
--- a/lib/acinstall
+++ b/lib/acinstall
@@ -11,7 +11,7 @@
# This 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 3, or (at your option)
+# 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,
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 1ab2f31..d3ba4f4 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -7,7 +7,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index ce96885..4ebd233 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -157,6 +157,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
diff --git a/lib/am/ansi2knr.am b/lib/am/ansi2knr.am
index e81f116..c4e1990 100644
--- a/lib/am/ansi2knr.am
+++ b/lib/am/ansi2knr.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/check.am b/lib/am/check.am
index 6653f7b..b1d1aad 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,10 +1,10 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 Free Software
+## Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
@@ -234,10 +234,11 @@ check-TESTS:
## cannot use `$?' to compute the set of lazily rerun tests, lest
## we rely on .PHONY to work portably.
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
AM_RECURSIVE_TARGETS += check
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 3e9eed2..054c62d 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,9 +1,9 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008 Free Software Foundation, Inc.
+## Copyright (C) 2008, 2009 Free Software Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 7656d47..8edbce3 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/clean.am b/lib/am/clean.am
index d74daca..c85feb1 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/compile.am b/lib/am/compile.am
index ecf4ff0..98e82e5 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/configure.am b/lib/am/configure.am
index f88665c..e9299d6 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/data.am b/lib/am/data.am
index 3e0eec3..36af717 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index e041051..08de45c 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 62d72f9..3765d71 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 579ecdd..3674fee 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 5ee7b5c..e3294fb 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,10 +1,10 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free
-## Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## Free Software Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
@@ -249,7 +249,7 @@ if %?SUBDIRS%
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
@@ -260,6 +260,8 @@ if %?SUBDIRS%
am__remove_distdir=: \
## Disable filename length check:
am__skip_length_check=: \
+## No need to fix modes more than once:
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -293,8 +295,13 @@ endif %?DIST-TARGETS%
## We use $(install_sh) because that is a known-portable way to modify
## the file in place in the source tree.
##
+## If we are being invoked recursively, then there is no need to walk
+## the whole subtree again. This is a complexity reduction for a deep
+## hierarchy of subpackages.
+##
if %?TOPDIR_P%
- -find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -457,6 +464,9 @@ distcheck: dist
## create very long directory names.
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
?DISTCHECK-HOOK? && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
+## Parallel BSD make may not start a new shell for each command in a recipe,
+## so be sure to `cd' back to the original directory after this.
+ && am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
?GETTEXT? --with-included-gettext \
@@ -494,7 +504,10 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) dist \
## Make sure to remove the dists we created in the test build directory.
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+## Cater to parallel BSD make (see above).
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
diff --git a/lib/am/footer.am b/lib/am/footer.am
index 952f059..a398093 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 22b64fa..d1cd76e 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/header.am b/lib/am/header.am
index 17dfdb9..077a2c9 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 4fa0d22..a49cfe9 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/install.am b/lib/am/install.am
index 8380fd3..d261070 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
@@ -88,7 +88,7 @@ install-strip:
## install_sh_PROGRAM is used for nobase_*_PROGRAMS (because install-sh
## creates directories)
## It's OK to override both with INSTALL_STRIP_PROGRAM, because
-## INSTALL_STRIP_PROGRAM uses install-sh (see m4/strip.m4 for a rational).
+## INSTALL_STRIP_PROGRAM uses install-sh (see m4/strip.m4 for a rationale).
##
## Use double quotes here because we might need to interpolate some
## backquotes at runtime.
diff --git a/lib/am/java.am b/lib/am/java.am
index 7ec62ae..d6eb455 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index a94b6ad..66adaa1 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/lex.am b/lib/am/lex.am
index 1b6c475..fb4077d 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/library.am b/lib/am/library.am
index 79d36b6..ce94e5e 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/libs.am b/lib/am/libs.am
index c92eff7..eec62a1 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index d565b69..dc2e199 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 4cbf630..3449d18 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 5788f78..29aa00c 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index ba8526d..9455234 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index c1139af..c99de88 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/mans.am b/lib/am/mans.am
index 1828c5d..66a6c7e 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
@@ -119,9 +119,9 @@ if %?NOTRANS_MANS%
?HAVE_NOTRANS? sed -n '/\.%SECTION%[a-z]*$$/p'; \
## Extract basename of manpage, change the extension if needed.
} | sed 's,.*/,,;s,\.[^%SECTION%][0-9a-z]*$$,.%SECTION%,'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(man%SECTION%dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man%SECTION%dir)" && rm -f $$files
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man%SECTION%dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man%SECTION%dir)" && rm -f $$files; }
endif %?NOTRANS_MANS%
if %?TRANS_MANS%
## Handle MANS without notrans_ prefix
@@ -136,7 +136,7 @@ if %?TRANS_MANS%
## transform, and change the extension if needed.
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^%SECTION%][0-9a-z]*$$,%SECTION%,;x'
\
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(man%SECTION%dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man%SECTION%dir)" && rm -f $$files
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man%SECTION%dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man%SECTION%dir)" && rm -f $$files; }
endif %?TRANS_MANS%
diff --git a/lib/am/multilib.am b/lib/am/multilib.am
index f755985..6897b5d 100644
--- a/lib/am/multilib.am
+++ b/lib/am/multilib.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/program.am b/lib/am/program.am
index 8f69c77..7e568e7 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,10 +1,10 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005
+## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 2009
## Free Software Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 64f7543..d39b23d 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/python.am b/lib/am/python.am
index 70beba4..9424a19 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index c1bc42f..5077be2 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,10 +1,10 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005,
-## 2008 Free Software Foundation, Inc.
+## 2008, 2009 Free Software Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
@@ -35,7 +35,8 @@
## by autoheader.
if %?FIRST%
%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES%
- $(am__cd) $(top_srcdir) && $(AUTOHEADER)
+## Cater to parallel BSD make.
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
## Whenever $(AUTOHEADER) has run, we must make sure that
## ./config.status will rebuild config.h. The dependency from %STAMP%
## on %CONFIG_H_DEPS% (which contains config.hin) is not enough to
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index cba6b63..790cb64 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 7fbb09e..b86e674 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 1eabe58..7463e2f 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,10 +1,10 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2007, 2008 Free Software Foundation, Inc.
+## 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 878f19b..680630b 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index aafa081..dca9ce1 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 8d0eb87..c9dcd9d 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -5,7 +5,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/vala.am b/lib/am/vala.am
index ed12dc5..63aa299 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -3,7 +3,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index df9a766..6d35cd4 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -4,7 +4,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/lib/compile b/lib/compile
index af472ac..ec64c62 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2009-03-03.21
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
# Foundation, Inc.
@@ -9,7 +9,7 @@ scriptversion=2009-03-03.21
#
# This 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 3, or (at your option)
+# 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,
@@ -138,5 +138,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/config.guess b/lib/config.guess
index e5716ee..da83314 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-02-03'
+timestamp='2009-04-27'
# 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
@@ -324,6 +324,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -1115,8 +1118,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
diff --git a/lib/config.sub b/lib/config.sub
index d546a94..a39437d 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-02-03'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -272,6 +272,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
diff --git a/lib/depcomp b/lib/depcomp
index 9ebfd85..df8eea7 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,14 +1,14 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-22.22
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
# Software Foundation, Inc.
# This 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 3, or (at your option)
+# 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,
@@ -625,5 +625,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/elisp-comp b/lib/elisp-comp
index 71f1a0f..ce8c82c 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,13 +1,14 @@
#!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
# Franc,ois Pinard <address@hidden>, 1995.
#
# This 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 3, or (at your option)
+# 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,
@@ -84,5 +85,6 @@ cp "$@" $tempdir
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/gnupload b/lib/gnupload
index 7c34784..8320b58 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,13 +1,13 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2009-03-05.20
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
#
# This 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 3, or (at your option)
+# 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,
@@ -407,5 +407,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/install-sh b/lib/install-sh
index a5897de..6781b98 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 757a5dc..e631b22 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,15 +1,15 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2007-03-30.02
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
+# Software Foundation, Inc.
# written by Ulrich Drepper <address@hidden>, June 1995
#
# This 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 3, or (at your option)
+# 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,
@@ -200,5 +200,6 @@ echo $day $month $year
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/missing b/lib/missing
index f359dae..28055d2 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,15 +1,15 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2008-12-21.33
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008 Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <address@hidden>, 1996.
# This 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 3, or (at your option)
+# 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,
@@ -371,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index ef7e16f..4191a45 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2006-05-11.19
+scriptversion=2009-04-28.21; # UTC
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -157,5 +157,6 @@ exit $errstatus
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/py-compile b/lib/py-compile
index 88776bc..3f9d05b 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -1,14 +1,14 @@
#!/bin/sh
# py-compile - Compile a Python program
-scriptversion=2008-10-26.11
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008 Free Software
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software
# Foundation, Inc.
# This 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 3, or (at your option)
+# 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,
@@ -141,5 +141,6 @@ sys.stdout.write('\n')" 2>/dev/null || :
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 960ab3c..0d3ba16 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2009-03-22.17}
+\def\texinfoversion{2009-05-16.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4396,20 +4396,19 @@ end
\def\bullet{bullet}%
\def\comma{,}%
\def\copyright{copyright}%
- \def\registeredsymbol{R}%
\def\dots{...}%
\def\enddots{...}%
\def\equiv{==}%
\def\error{error}%
\def\euro{euro}%
+ \def\expansion{==>}%
\def\guillemetleft{<<}%
\def\guillemetright{>>}%
\def\guilsinglleft{<}%
\def\guilsinglright{>}%
- \def\expansion{==>}%
\def\minus{-}%
- \def\pounds{pounds}%
\def\point{.}%
+ \def\pounds{pounds}%
\def\print{-|}%
\def\quotedblbase{"}%
\def\quotedblleft{"}%
@@ -4417,8 +4416,9 @@ end
\def\quoteleft{`}%
\def\quoteright{'}%
\def\quotesinglbase{,}%
+ \def\registeredsymbol{R}%
\def\result{=>}%
- \def\textdegree{degrees}%
+ \def\textdegree{o}%
%
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
@@ -9273,10 +9273,11 @@ directory should work if nowhere else does.}
@markupsetuprqdefault
@c Gnulib now utterly and painfully insists on no trailing whitespace.
address@hidden So nuke it.
address@hidden So we have to nuke it.
@c Local variables:
address@hidden eval: (add-hook 'write-file-hooks 'time-stamp
'nuke-trailing-whitespace)
address@hidden eval: (add-hook 'write-file-hooks 'time-stamp)
address@hidden eval: (add-hook 'write-file-hooks 'nuke-trailing-whitespace)
@c page-delimiter: "^\\\\message"
@c time-stamp-start: "def\\\\texinfoversion{"
@c time-stamp-format: "%:y-%02m-%02d.%02H"
diff --git a/lib/ylwrap b/lib/ylwrap
index bb58968..84d5634 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,16 +1,16 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2007-11-22.22
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007 Free Software Foundation, Inc.
+# 2007, 2009 Free Software Foundation, Inc.
#
# Written by Tom Tromey <address@hidden>.
#
# This 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 3, or (at your option)
+# 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,
@@ -217,5 +217,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b8194d6..3ea8840 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -7,7 +7,7 @@
## This 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 3, or (at your option)
+## 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,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7cc2c68..df6b81b 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -157,6 +157,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index c6a24af..ff3a85e 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
# 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.10c'
+[am__api_version='1.11a'
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.10c], [],
+m4_if([$1], [1.11a], [],
[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.10c])dnl
+[AM_AUTOMAKE_VERSION([1.11a])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/python.m4 b/m4/python.m4
index 3adf87b..16de9c3 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,7 +3,7 @@
## From Andrew Dalke
## Updated by James Henstridge
## ------------------------
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -115,8 +115,29 @@ python2.1 python2.0])
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig;
print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ [if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import
sysconfig;
sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))"
2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ 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,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+
am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -132,8 +153,29 @@ python2.1 python2.0])
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig;
print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ [if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import
sysconfig;
sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))"
2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ 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,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+
am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 093dde5..62529a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,8 @@ XFAIL_TESTS = \
all.test \
auxdir2.test \
cond17.test \
-txinfo5.test \
-vala5.test
+gcj6.test \
+txinfo5.test
include $(srcdir)/parallel-tests.am
@@ -304,6 +304,7 @@ gcj2.test \
gcj3.test \
gcj4.test \
gcj5.test \
+gcj6.test \
getopt.test \
gettext.test \
gettext2.test \
@@ -423,6 +424,7 @@ lzma.test \
maintclean.test \
make.test \
makej.test \
+makej2.test \
maken.test \
maken2.test \
maken3.test \
@@ -502,6 +504,7 @@ parallel-tests6.test \
parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
+parallel-tests10.test \
parse.test \
percent.test \
percent2.test \
@@ -629,6 +632,7 @@ subobjname.test \
subpkg.test \
subpkg2.test \
subpkg3.test \
+subpkg4.test \
subst.test \
subst2.test \
subst3.test \
@@ -737,8 +741,8 @@ EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
# Each test case depends on defs, aclocal, and automake.
check_SCRIPTS = defs defs-p aclocal-$(APIVERSION) automake-$(APIVERSION)
-clean-local: check-clean-local
-
-check-clean-local:
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
-chmod -R u+rwx *.dir
-rm -rf defs-p *.dir
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 03d3874..a494feb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10c from Makefile.am.
+# Makefile.in generated by automake 1.11a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -217,6 +217,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
@@ -228,8 +229,8 @@ XFAIL_TESTS = \
all.test \
auxdir2.test \
cond17.test \
-txinfo5.test \
-vala5.test
+gcj6.test \
+txinfo5.test
parallel_tests = \
check-p.test \
@@ -536,6 +537,7 @@ gcj2.test \
gcj3.test \
gcj4.test \
gcj5.test \
+gcj6.test \
getopt.test \
gettext.test \
gettext2.test \
@@ -655,6 +657,7 @@ lzma.test \
maintclean.test \
make.test \
makej.test \
+makej2.test \
maken.test \
maken2.test \
maken3.test \
@@ -734,6 +737,7 @@ parallel-tests6.test \
parallel-tests7.test \
parallel-tests8.test \
parallel-tests9.test \
+parallel-tests10.test \
parse.test \
percent.test \
percent2.test \
@@ -861,6 +865,7 @@ subobjname.test \
subpkg.test \
subpkg2.test \
subpkg3.test \
+subpkg4.test \
subst.test \
subst2.test \
subst3.test \
@@ -1127,10 +1132,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set_logs=; if test "X$(TEST_LOGS)" = X.log; then \
- set_logs=TEST_LOGS=; \
- fi; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+ @list='$(TEST_LOGS)'; \
+ list=`for f in $$list; do \
+ test .log = $$f || echo $$f; \
+ done | tr '\012\015' ' '`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
@@ -1327,9 +1333,9 @@ $(parallel_tests): $(parallel_tests:-p.test=.test)
Makefile.am
defs-p: defs Makefile.am
sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@
-clean-local: check-clean-local
-
-check-clean-local:
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
-chmod -R u+rwx *.dir
-rm -rf defs-p *.dir
diff --git a/tests/aclibobj.test b/tests/aclibobj.test
index be79452..6ef6f6b 100755
--- a/tests/aclibobj.test
+++ b/tests/aclibobj.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca10.test b/tests/acloca10.test
index 07a9878..7716f2a 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca11.test b/tests/acloca11.test
index 3e98103..61e9e8a 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca12.test b/tests/acloca12.test
index 8b3c3a1..14d699a 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca13.test b/tests/acloca13.test
index 09c3de1..56a54eb 100755
--- a/tests/acloca13.test
+++ b/tests/acloca13.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca14.test b/tests/acloca14.test
index c07afa6..8ddbb1a 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca15.test b/tests/acloca15.test
index 3cfcd1a..dd612ec 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca16.test b/tests/acloca16.test
index 85b88d7..93bde8b 100755
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 196d20b..884f24b 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca18.test b/tests/acloca18.test
index be827e3..22feb23 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca19.test b/tests/acloca19.test
index 909aa7a..accad81 100755
--- a/tests/acloca19.test
+++ b/tests/acloca19.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca20.test b/tests/acloca20.test
index 376752d..6408bef 100755
--- a/tests/acloca20.test
+++ b/tests/acloca20.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acloca21.test b/tests/acloca21.test
index 769a3c2..7b66279 100755
--- a/tests/acloca21.test
+++ b/tests/acloca21.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal.test b/tests/aclocal.test
index a894d98..6b87a9d 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index fb24b62..a550e50 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index d46edc4..9fa96ec 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index 18b8798..5cd8231 100755
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index 19aaea4..266d64b 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal7.test b/tests/aclocal7.test
index d8a186d..e123a3f 100755
--- a/tests/aclocal7.test
+++ b/tests/aclocal7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index 78b7a3b..ac10aff 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index a4f8cb7..325f6ae 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutbs.test b/tests/acoutbs.test
index 2d1d56a..0f5eb48 100755
--- a/tests/acoutbs.test
+++ b/tests/acoutbs.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test
index c26bd1f..2df24c2 100755
--- a/tests/acoutbs2.test
+++ b/tests/acoutbs2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index 2821120..b7bb616 100755
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutpt.test b/tests/acoutpt.test
index 7e6d630..b0e44ee 100755
--- a/tests/acoutpt.test
+++ b/tests/acoutpt.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutpt2.test b/tests/acoutpt2.test
index ddb73a1..fb8fbcf 100755
--- a/tests/acoutpt2.test
+++ b/tests/acoutpt2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index d284493..70c5cbc 100755
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acsilent.test b/tests/acsilent.test
index 04438fd..6ac7863 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acsubst.test b/tests/acsubst.test
index ee82488..e8eaace 100755
--- a/tests/acsubst.test
+++ b/tests/acsubst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
index ca098b3..b1c0bce 100755
--- a/tests/acsubst2.test
+++ b/tests/acsubst2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/all.test b/tests/all.test
index c2fdfb2..3d761f4 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/alloca.test b/tests/alloca.test
index 2078ef3..6cf51bb 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 4d1ee04..4ecd229 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/alpha.test b/tests/alpha.test
index 9994d9d..1ee8ed6 100755
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/alpha2.test b/tests/alpha2.test
index d0b5da9..e125377 100755
--- a/tests/alpha2.test
+++ b/tests/alpha2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/amassign.test b/tests/amassign.test
index 2d7ed3c..3e411c8 100755
--- a/tests/amassign.test
+++ b/tests/amassign.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ammissing.test b/tests/ammissing.test
index ba31b6e..61d360a 100755
--- a/tests/ammissing.test
+++ b/tests/ammissing.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/amopt.test b/tests/amopt.test
index c969bec..e83b800 100755
--- a/tests/amopt.test
+++ b/tests/amopt.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/amsubst.test b/tests/amsubst.test
index d696344..1fad2ca 100755
--- a/tests/amsubst.test
+++ b/tests/amsubst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi.test b/tests/ansi.test
index 1bb6616..cd9a07b 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi10.test b/tests/ansi10.test
index 8f1791a..88b8618 100755
--- a/tests/ansi10.test
+++ b/tests/ansi10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi2.test b/tests/ansi2.test
index f170455..c0409a3 100755
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi3.test b/tests/ansi3.test
index 0c24779..2bbcaf7 100755
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
index aa25a21..8f254ad 100755
--- a/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi4.test b/tests/ansi4.test
index 819d899..baff19a 100755
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi5.test b/tests/ansi5.test
index 4be0f79..2652cb7 100755
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi6.test b/tests/ansi6.test
index 0a37d6b..10196ea 100755
--- a/tests/ansi6.test
+++ b/tests/ansi6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi7.test b/tests/ansi7.test
index 846b14f..e97f517 100755
--- a/tests/ansi7.test
+++ b/tests/ansi7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi8.test b/tests/ansi8.test
index 298ccc4..33f17dc 100755
--- a/tests/ansi8.test
+++ b/tests/ansi8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ansi9.test b/tests/ansi9.test
index 208b1ac..4eb1820 100755
--- a/tests/ansi9.test
+++ b/tests/ansi9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ar.test b/tests/ar.test
index 3af7925..d68fc54 100755
--- a/tests/ar.test
+++ b/tests/ar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ar2.test b/tests/ar2.test
index df4308e..f0485ce 100755
--- a/tests/ar2.test
+++ b/tests/ar2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/asm.test b/tests/asm.test
index bc234f6..6c0aa3d 100755
--- a/tests/asm.test
+++ b/tests/asm.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/asm2.test b/tests/asm2.test
index c770583..8afd4f9 100755
--- a/tests/asm2.test
+++ b/tests/asm2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/asm3.test b/tests/asm3.test
index c55eda7..0738d6a 100755
--- a/tests/asm3.test
+++ b/tests/asm3.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/autohdr.test b/tests/autohdr.test
index 9e3d88f..014d2b7 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 9d4da7b..2ddce32 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index 7e6f85a..8e9f079 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index f785998..187429f 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/automake.test b/tests/automake.test
index 44a2993..f8b4fef 100755
--- a/tests/automake.test
+++ b/tests/automake.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 358a2fc..95a7a20 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/auxdir2.test b/tests/auxdir2.test
index a20e786..590a5df 100755
--- a/tests/auxdir2.test
+++ b/tests/auxdir2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/auxdir3.test b/tests/auxdir3.test
index 3ac0cab..c828051 100755
--- a/tests/auxdir3.test
+++ b/tests/auxdir3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/auxdir4.test b/tests/auxdir4.test
index be2a0c4..0447809 100755
--- a/tests/auxdir4.test
+++ b/tests/auxdir4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/backsl.test b/tests/backsl.test
index 0e50f52..e5d2b39 100755
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/backsl2.test b/tests/backsl2.test
index 9745eb7..ba62db7 100755
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/backsl3.test b/tests/backsl3.test
index c095d83..76fdd9a 100755
--- a/tests/backsl3.test
+++ b/tests/backsl3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/backsl4.test b/tests/backsl4.test
index d9ce21d..16eab5f 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/badline.test b/tests/badline.test
index 046146f..7c63697 100755
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/badopt.test b/tests/badopt.test
index c028cdf..59eb5fa 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/badprog.test b/tests/badprog.test
index 21fb4d7..b8d45e9 100755
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/block.test b/tests/block.test
index 822181c..8b4692a 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/bsource.test b/tests/bsource.test
index 3d10517..80066d8 100755
--- a/tests/bsource.test
+++ b/tests/bsource.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon-name.test b/tests/canon-name.test
index 9f81e10..50a4dff 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon.test b/tests/canon.test
index cfb1c11..2b035d0 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon2.test b/tests/canon2.test
index d6116da..e8acb81 100755
--- a/tests/canon2.test
+++ b/tests/canon2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon3.test b/tests/canon3.test
index 337f230..da347eb 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon4.test b/tests/canon4.test
index 126650f..607ba2e 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/canon5.test b/tests/canon5.test
index 882c39d..768e087 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ccnoco.test b/tests/ccnoco.test
index 327001c..d6ed136 100755
--- a/tests/ccnoco.test
+++ b/tests/ccnoco.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test
index 325c989..062fe6b 100755
--- a/tests/ccnoco2.test
+++ b/tests/ccnoco2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check.test b/tests/check.test
index e6da57f..0c258c5 100755
--- a/tests/check.test
+++ b/tests/check.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check10.test b/tests/check10.test
index d0f1b60..76af452 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check11.test b/tests/check11.test
index 2ee1145..d3118a7 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check2.test b/tests/check2.test
index d8071f4..1db0454 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check3.test b/tests/check3.test
index 0050e45..65705c4 100755
--- a/tests/check3.test
+++ b/tests/check3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check4.test b/tests/check4.test
index ac367ca..70dc55a 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check5.test b/tests/check5.test
index e2e0210..857432b 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check6.test b/tests/check6.test
index 5e102fc..e32499c 100755
--- a/tests/check6.test
+++ b/tests/check6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check7.test b/tests/check7.test
index a304cc1..1653a8d 100755
--- a/tests/check7.test
+++ b/tests/check7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check8.test b/tests/check8.test
index 1fe2a53..7936582 100755
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check9.test b/tests/check9.test
index 658e636..ed88690 100755
--- a/tests/check9.test
+++ b/tests/check9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/checkall.test b/tests/checkall.test
index 145dade..4e7388b 100755
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/clean.test b/tests/clean.test
index eafa9c0..df1c168 100755
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/clean2.test b/tests/clean2.test
index cc6a121..99e4c2e 100755
--- a/tests/clean2.test
+++ b/tests/clean2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colneq.test b/tests/colneq.test
index 39ef93d..59d2414 100755
--- a/tests/colneq.test
+++ b/tests/colneq.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colneq2.test b/tests/colneq2.test
index a3a6475..bca83ce 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon.test b/tests/colon.test
index f648d89..2fd0538 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon2.test b/tests/colon2.test
index b66a316..ebb2bfe 100755
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon3.test b/tests/colon3.test
index 41c4edb..6fed8b9 100755
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon4.test b/tests/colon4.test
index 80d57fa..cec3c86 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon5.test b/tests/colon5.test
index 1d0b8a1..7813d94 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon6.test b/tests/colon6.test
index ed0d1c0..5bd9964 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/colon7.test b/tests/colon7.test
index cb07fb7..4df6a13 100755
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/color.test b/tests/color.test
index cd66845..a5bd063 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/commen10.test b/tests/commen10.test
index 762920a..d7148f8 100755
--- a/tests/commen10.test
+++ b/tests/commen10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/commen11.test b/tests/commen11.test
index 7596723..963f2f8 100755
--- a/tests/commen11.test
+++ b/tests/commen11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment.test b/tests/comment.test
index 4d01c3c..0051cd0 100755
--- a/tests/comment.test
+++ b/tests/comment.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment2.test b/tests/comment2.test
index a4008e0..2073328 100755
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment3.test b/tests/comment3.test
index fb46d32..14980c8 100755
--- a/tests/comment3.test
+++ b/tests/comment3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment4.test b/tests/comment4.test
index b444a0f..f6e6a3f 100755
--- a/tests/comment4.test
+++ b/tests/comment4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment5.test b/tests/comment5.test
index 713dbb1..21b5e87 100755
--- a/tests/comment5.test
+++ b/tests/comment5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment6.test b/tests/comment6.test
index 4ac80b9..efa8482 100755
--- a/tests/comment6.test
+++ b/tests/comment6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment7.test b/tests/comment7.test
index 35656c7..f28b711 100755
--- a/tests/comment7.test
+++ b/tests/comment7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment8.test b/tests/comment8.test
index f5c446a..58ef56a 100755
--- a/tests/comment8.test
+++ b/tests/comment8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/comment9.test b/tests/comment9.test
index 68c909a..b106b3a 100755
--- a/tests/comment9.test
+++ b/tests/comment9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/compile.test b/tests/compile.test
index bcc8b10..ef27afe 100755
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/compile2.test b/tests/compile2.test
index fdc583f..fe4574a 100755
--- a/tests/compile2.test
+++ b/tests/compile2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index 312c2ef..a685a29 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index c9085ca..941c7db 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond.test b/tests/cond.test
index 111898b..586d80a 100755
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond10.test b/tests/cond10.test
index 254304b..ec5766b 100755
--- a/tests/cond10.test
+++ b/tests/cond10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond11.test b/tests/cond11.test
index 51b7c2f..15c6c2a 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond13.test b/tests/cond13.test
index 9104c25..3cf5462 100755
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond14.test b/tests/cond14.test
index 0e0a539..2181325 100755
--- a/tests/cond14.test
+++ b/tests/cond14.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond15.test b/tests/cond15.test
index 3010c28..a371baa 100755
--- a/tests/cond15.test
+++ b/tests/cond15.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond16.test b/tests/cond16.test
index 5aebbca..467b718 100755
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond17.test b/tests/cond17.test
index d2f9052..7368d9a 100755
--- a/tests/cond17.test
+++ b/tests/cond17.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond18.test b/tests/cond18.test
index a4737b0..3119658 100755
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond19.test b/tests/cond19.test
index f9d49b7..14dfb51 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond2.test b/tests/cond2.test
index 92140db..a548ef6 100755
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond20.test b/tests/cond20.test
index 145b5a2..d0557e5 100755
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond21.test b/tests/cond21.test
index fd997c2..160c76f 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond22.test b/tests/cond22.test
index 0a60cf4..4ef1967 100755
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond23.test b/tests/cond23.test
index cae597d..4ec596d 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond24.test b/tests/cond24.test
index 9c07df3..6f76e4d 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond25.test b/tests/cond25.test
index 4b21ca1..332fda5 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond26.test b/tests/cond26.test
index 715cd93..a9baa55 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond27.test b/tests/cond27.test
index 4767b56..3082902 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond28.test b/tests/cond28.test
index 409d954..ccdcf9e 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond29.test b/tests/cond29.test
index bc905d5..12badcb 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond3.test b/tests/cond3.test
index 98e081a..6728721 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond30.test b/tests/cond30.test
index 4b90929..e092c45 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond31.test b/tests/cond31.test
index 7fcb0d0..4975ef4 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond32.test b/tests/cond32.test
index d2bc9fe..ae5c8c6 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond33.test b/tests/cond33.test
index 651b0c7..0aff11a 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond34.test b/tests/cond34.test
index c6de0e9..9e42eea 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond35.test b/tests/cond35.test
index 99ad81b..6b3a4d4 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond36.test b/tests/cond36.test
index e5e8f8b..58eb529 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond37.test b/tests/cond37.test
index 9b9b5b3..144c2ac 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond38.test b/tests/cond38.test
index 0cf3c26..0051e1f 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond39.test b/tests/cond39.test
index 54088b7..79eaa70 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/cond4.test b/tests/cond4.test
index 74397a8..cc569d6 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond40.test b/tests/cond40.test
index b6408ca..be94fe3 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/cond41.test b/tests/cond41.test
index 16da943..b32bff3 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/cond42.test b/tests/cond42.test
index 4b9e604..00ca114 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/cond43.test b/tests/cond43.test
index d1a863d..1b468a7 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/cond5.test b/tests/cond5.test
index 9643273..531cda8 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond6.test b/tests/cond6.test
index 3490058..1f442f9 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond7.test b/tests/cond7.test
index 523acc9..4d611ba 100755
--- a/tests/cond7.test
+++ b/tests/cond7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond8.test b/tests/cond8.test
index 2286a10..195a912 100755
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cond9.test b/tests/cond9.test
index d8ab417..dd59758 100755
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condd.test b/tests/condd.test
index 2467e64..0e9b6e8 100755
--- a/tests/condd.test
+++ b/tests/condd.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condhook.test b/tests/condhook.test
index 772d363..06fa887 100755
--- a/tests/condhook.test
+++ b/tests/condhook.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condinc.test b/tests/condinc.test
index c31afb3..eddd3bc 100755
--- a/tests/condinc.test
+++ b/tests/condinc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condinc2.test b/tests/condinc2.test
index 2dd1313..088fb55 100755
--- a/tests/condinc2.test
+++ b/tests/condinc2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condlib.test b/tests/condlib.test
index af7237e..49cc9f1 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condman.test b/tests/condman.test
index 8b5c3a5..3dc8bcd 100755
--- a/tests/condman.test
+++ b/tests/condman.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/condman2.test b/tests/condman2.test
index cc0d9db..0b448e2 100755
--- a/tests/condman2.test
+++ b/tests/condman2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conf2.test b/tests/conf2.test
index aa74e94..23a8a5b 100755
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confdeps.test b/tests/confdeps.test
index 2047a27..47cdc16 100755
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conff.test b/tests/conff.test
index 615ba78..353cb8e 100755
--- a/tests/conff.test
+++ b/tests/conff.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conff2.test b/tests/conff2.test
index 96a3269..0c53067 100755
--- a/tests/conff2.test
+++ b/tests/conff2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confh.test b/tests/confh.test
index 8e61026..772a763 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confh4.test b/tests/confh4.test
index eaf9a40..a93e38d 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confh5.test b/tests/confh5.test
index 8e03525..15593c8 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/config.test b/tests/config.test
index 32b38ea..bed9a92 100755
--- a/tests/config.test
+++ b/tests/config.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confincl.test b/tests/confincl.test
index bf4fbad..dd0b63e 100755
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conflnk.test b/tests/conflnk.test
index e214628..6bc5970 100755
--- a/tests/conflnk.test
+++ b/tests/conflnk.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conflnk2.test b/tests/conflnk2.test
index 852d5e5..8a045be 100755
--- a/tests/conflnk2.test
+++ b/tests/conflnk2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index 7845364..6dfbe1b 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index ba5d052..4bedf52 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/confsub.test b/tests/confsub.test
index 767b198..40c90c5 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confvar.test b/tests/confvar.test
index b23343c..f098baf 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/confvar2.test b/tests/confvar2.test
index 058d0e1..ea9c81e 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/copy.test b/tests/copy.test
index 57a5d72..770ae51 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ctarget1.test b/tests/ctarget1.test
index 937cb6c..d2191f6 100755
--- a/tests/ctarget1.test
+++ b/tests/ctarget1.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxx.test b/tests/cxx.test
index f2748a0..2105c00 100755
--- a/tests/cxx.test
+++ b/tests/cxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxx2.test b/tests/cxx2.test
index fd145c2..0b9e880 100755
--- a/tests/cxx2.test
+++ b/tests/cxx2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index f2e0826..da8bd6b 100755
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 0609bbf..257505f 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index b9c2672..82f9e85 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index ce743b7..b7a86f0 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index 218e64a..9d5fa7b 100755
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 30fe611..116df06 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index 5cf53b2..6b8d70a 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dash.test b/tests/dash.test
index 4c0d789..03876dd 100755
--- a/tests/dash.test
+++ b/tests/dash.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/defs.in b/tests/defs.in
index d44ac9f..d1366f1 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -6,7 +6,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -247,25 +247,32 @@ Exit ()
curdir=`pwd`
testSubDir=$me.dir
-chmod -R u+rwx $testSubDir > /dev/null 2>&1
-rm -rf $testSubDir > /dev/null 2>&1
+test ! -d $testSubDir || {
+ find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+ rm -rf $testSubDir
+}
mkdir $testSubDir
-trap 'exit_status=$?
- cd "$curdir"
- case $exit_status,$keep_testdirs in
- 0,)
- chmod -R a+rwx $testSubDir > /dev/null 2>&1
- rm -rf "$testSubDir" ;;
- esac
- test "$signal" != 0 &&
- echo "$as_me: caught signal $signal"
- echo "$as_me: exit $exit_status"
- exit $exit_status
-' 0
-for signal in 1 2 13 15; do
- trap 'signal='$signal'; { Exit 1; }' $signal
-done
address@hidden@
+if test "$sh_errexit_works" = yes; then
+ trap 'exit_status=$?
+ set +e
+ cd "$curdir"
+ case $exit_status,$keep_testdirs in
+ 0,)
+ find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+ rm -rf $testSubDir
+ ;;
+ esac
+ test "$signal" != 0 &&
+ echo "$as_me: caught signal $signal"
+ echo "$as_me: exit $exit_status"
+ exit $exit_status
+ ' 0
+ for signal in 1 2 13 15; do
+ trap 'signal='$signal'; { Exit 1; }' $signal
+ done
+fi
signal=0
# Copy in some files we need.
@@ -293,9 +300,14 @@ END
unset MFLAGS
unset MAKEFLAGS
unset MAKELEVEL
-unset DESTDIR
# Unset verbosity flag.
unset V
+# Also unset variables that will let `make -e install' divert
+# files into unwanted directories.
+unset DESTDIR
+unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
+unset htmldir includedir infodir libdir libexecdir localedir mandir
+unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
# Also unset variables that control our test driver. While not
# conceptually independent, they cause some changed semantics we
# need to control (and test for) in some of the tests to ensure
diff --git a/tests/defun.test b/tests/defun.test
index 69cf7a1..2b3ad2b 100755
--- a/tests/defun.test
+++ b/tests/defun.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/defun2.test b/tests/defun2.test
index faecf8a..a0bf273 100755
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 8ccb9a1..3308977 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index dd9fd46..531f744 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
index 56106b4..d812ac4 100755
--- a/tests/dejagnu3.test
+++ b/tests/dejagnu3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test
index 40b5834..5fdda10 100755
--- a/tests/dejagnu4.test
+++ b/tests/dejagnu4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test
index 0b8daca..0095958 100755
--- a/tests/dejagnu5.test
+++ b/tests/dejagnu5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
index 7d9b239..25a1f1f 100755
--- a/tests/dejagnu6.test
+++ b/tests/dejagnu6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index 14d082d..9abd428 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depacl2.test b/tests/depacl2.test
index 8ee3463..d085a50 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp.test b/tests/depcomp.test
index a75e455..7e40617 100755
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index a538df8..4653c90 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp3.test b/tests/depcomp3.test
index 9f712df..2a5db60 100755
--- a/tests/depcomp3.test
+++ b/tests/depcomp3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp4.test b/tests/depcomp4.test
index 1f886fb..7d22894 100755
--- a/tests/depcomp4.test
+++ b/tests/depcomp4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp5.test b/tests/depcomp5.test
index 75a5eaa..9637288 100755
--- a/tests/depcomp5.test
+++ b/tests/depcomp5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp6.test b/tests/depcomp6.test
index aafac13..0b6a7f5 100755
--- a/tests/depcomp6.test
+++ b/tests/depcomp6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depcomp7.test b/tests/depcomp7.test
index d34d5f0..67702c7 100755
--- a/tests/depcomp7.test
+++ b/tests/depcomp7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depdist.test b/tests/depdist.test
index 8afb60d..f36eb47 100755
--- a/tests/depdist.test
+++ b/tests/depdist.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend.test b/tests/depend.test
index e3090a3..5714c98 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend2.test b/tests/depend2.test
index 15624a0..c259108 100755
--- a/tests/depend2.test
+++ b/tests/depend2.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend3.test b/tests/depend3.test
index 21eb440..080fc56 100755
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend4.test b/tests/depend4.test
index 542692a..451c018 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend5.test b/tests/depend5.test
index a34e765..0d9be3b 100755
--- a/tests/depend5.test
+++ b/tests/depend5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/depend6.test b/tests/depend6.test
index 7a1f722..de2adf9 100755
--- a/tests/depend6.test
+++ b/tests/depend6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/destdir.test b/tests/destdir.test
index 50ccb1a..951a4b1 100755
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dirforbid.test b/tests/dirforbid.test
index 648ce5a..3ab319d 100755
--- a/tests/dirforbid.test
+++ b/tests/dirforbid.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 5cd5f3a..cfa1ed9 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dirlist2.test b/tests/dirlist2.test
index c40f57d..5f49614 100755
--- a/tests/dirlist2.test
+++ b/tests/dirlist2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/discover.test b/tests/discover.test
index 292060f..36293f7 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
index 31ffec8..8603329 100755
--- a/tests/distcleancheck.test
+++ b/tests/distcleancheck.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 2399b14..9ed4675 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom3.test b/tests/distcom3.test
index be2ea6e..04bf365 100755
--- a/tests/distcom3.test
+++ b/tests/distcom3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom4.test b/tests/distcom4.test
index 24810b4..32be702 100755
--- a/tests/distcom4.test
+++ b/tests/distcom4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom5.test b/tests/distcom5.test
index bb14f86..2462685 100755
--- a/tests/distcom5.test
+++ b/tests/distcom5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom6.test b/tests/distcom6.test
index 2b4e24e..b7abba3 100755
--- a/tests/distcom6.test
+++ b/tests/distcom6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distcom7.test b/tests/distcom7.test
index 34fccbd..557be44 100755
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distdir.test b/tests/distdir.test
index 4c861bf..af2d01a 100755
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/distname.test b/tests/distname.test
index 258eaf6..6c18608 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dollar.test b/tests/dollar.test
index ae96623..77b5129 100755
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index ea042b5..bdc73ab 100755
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
index 676cde2..0d12afd 100755
--- a/tests/dollarvar2.test
+++ b/tests/dollarvar2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/double.test b/tests/double.test
index 16bf42f..d8dfcf1 100755
--- a/tests/double.test
+++ b/tests/double.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/dup2.test b/tests/dup2.test
index 66e1202..654d99b 100755
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/else.test b/tests/else.test
index 58d13a7..32cf81a 100755
--- a/tests/else.test
+++ b/tests/else.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/empty.test b/tests/empty.test
index b900796..db5af87 100755
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/empty2.test b/tests/empty2.test
index d838456..28a2d27 100755
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/empty3.test b/tests/empty3.test
index 59d327f..0f9a4a8 100755
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/empty4.test b/tests/empty4.test
index e191440..7769fd3 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exdir.test b/tests/exdir.test
index 2754ef1..0dd0566 100755
--- a/tests/exdir.test
+++ b/tests/exdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exdir2.test b/tests/exdir2.test
index 2c5060f..aca1497 100755
--- a/tests/exdir2.test
+++ b/tests/exdir2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exdir3.test b/tests/exdir3.test
index 55fd6bf..d51bdf9 100755
--- a/tests/exdir3.test
+++ b/tests/exdir3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exeext.test b/tests/exeext.test
index 638318f..4ad837b 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exeext2.test b/tests/exeext2.test
index 4894268..fc05712 100755
--- a/tests/exeext2.test
+++ b/tests/exeext2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exeext3.test b/tests/exeext3.test
index f012ff3..28a7d5e 100755
--- a/tests/exeext3.test
+++ b/tests/exeext3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exeext4.test b/tests/exeext4.test
index 344945d..7bea7d4 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/exsource.test b/tests/exsource.test
index cb586f0..2747f6e 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ext.test b/tests/ext.test
index f478af2..929afd5 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ext2.test b/tests/ext2.test
index fa06d63..3262f49 100755
--- a/tests/ext2.test
+++ b/tests/ext2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra.test b/tests/extra.test
index 2d1f4dd..70e1f1f 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra2.test b/tests/extra2.test
index 628792f..a2a64d7 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra3.test b/tests/extra3.test
index 0d70c42..ad74acc 100755
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra4.test b/tests/extra4.test
index 983afb4..f559720 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra5.test b/tests/extra5.test
index fd61628..21f756e 100755
--- a/tests/extra5.test
+++ b/tests/extra5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra6.test b/tests/extra6.test
index 5629f4a..0dbf735 100755
--- a/tests/extra6.test
+++ b/tests/extra6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra7.test b/tests/extra7.test
index a481506..233cb0f 100755
--- a/tests/extra7.test
+++ b/tests/extra7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/extra8.test b/tests/extra8.test
index 02272d4..eb9f9a1 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/f90only.test b/tests/f90only.test
index 4a2cbe4..6fbfd2d 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/flavor.test b/tests/flavor.test
index c9ea970..a7e8f77 100755
--- a/tests/flavor.test
+++ b/tests/flavor.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/flibs.test b/tests/flibs.test
index b688d72..8dc66db 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fn99.test b/tests/fn99.test
index 31ee1b5..982a989 100755
--- a/tests/fn99.test
+++ b/tests/fn99.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test
index f0a7928..465f2af 100755
--- a/tests/fn99subdir.test
+++ b/tests/fn99subdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fnoc.test b/tests/fnoc.test
index f791fa0..13d9add 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fo.test b/tests/fo.test
index 2d78463..1d7809c 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fonly.test b/tests/fonly.test
index 3006ada..6af719c 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fort1.test b/tests/fort1.test
index 08cf003..930ae02 100755
--- a/tests/fort1.test
+++ b/tests/fort1.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fort2.test b/tests/fort2.test
index 3c59161..3568189 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fort4.test b/tests/fort4.test
index d6740ca..605a377 100755
--- a/tests/fort4.test
+++ b/tests/fort4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fort5.test b/tests/fort5.test
index 4390711..cd2a7d5 100755
--- a/tests/fort5.test
+++ b/tests/fort5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fortdep.test b/tests/fortdep.test
index e160895..8e62298 100755
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index 6bc551c..c6b4900 100755
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 980805f..6c645eb 100755
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gcj.test b/tests/gcj.test
index bbb385d..c32a1b2 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gcj2.test b/tests/gcj2.test
index 9ddfb0a..3e3af60 100755
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gcj3.test b/tests/gcj3.test
index e7eecd1..7d8a981 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gcj4.test b/tests/gcj4.test
index 16d15c1..f3828ea 100755
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gcj5.test b/tests/gcj5.test
index 0361cf3..6ef171d 100755
--- a/tests/gcj5.test
+++ b/tests/gcj5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check11.test b/tests/gcj6.test
similarity index 61%
copy from tests/check11.test
copy to tests/gcj6.test
index 2ee1145..be5f49c 100755
--- a/tests/check11.test
+++ b/tests/gcj6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -14,40 +14,40 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check skip summary.
+# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
+required='gcj'
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
+AM_PROG_GCJ
AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS = skip skip2
+noinst_PROGRAMS = test
+test_SOURCES = Test.java
+test_LDFLAGS = --main=Test
END
-cat >>skip <<'END'
-#! /bin/sh
-exit 77
+cat >Test.java << 'END'
+public class Test {
+ public static void main(String[] argv) {
+ System.out.println("Hello, automake!");
+ }
+}
END
-chmod a+x skip
-cp skip skip2
$ACLOCAL
+$AUTOMAKE
$AUTOCONF
-$AUTOMAKE -a
-
-unset TESTS || :
-
./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
-grep '1.*passed' stdout && Exit 1
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
-grep '2.*passed' stdout && Exit 1
+# These fail without e.g., AC_PROG_CC.
+$MAKE
+grep "OBJEXT = " Makefile
+grep "EXEEXT = " Makefile
:
diff --git a/tests/getopt.test b/tests/getopt.test
index 8dc9512..bc82984 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gettext.test b/tests/gettext.test
index 61dea1c..b0bb2d2 100755
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gettext2.test b/tests/gettext2.test
index dfb7b47..41128e2 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gettext3.test b/tests/gettext3.test
index 02e68ad..a25af87 100755
--- a/tests/gettext3.test
+++ b/tests/gettext3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnits.test b/tests/gnits.test
index 4e5b73e..897d0ab 100755
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnits2.test b/tests/gnits2.test
index cd1a39e..4c5d54f 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 5a826c2..7a08fb8 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnumake.test b/tests/gnumake.test
index 838c0a2..72bfa66 100755
--- a/tests/gnumake.test
+++ b/tests/gnumake.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index d4aa62b..9c8aeb4 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
index d0eba34..0227e3a 100755
--- a/tests/gnuwarn2.test
+++ b/tests/gnuwarn2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/header.test b/tests/header.test
index 5f2cb81..2ad2735 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/help.test b/tests/help.test
index 030624f..d4d7110 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/hfs.test b/tests/hfs.test
index 5fefff6..8022729 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/hosts.test b/tests/hosts.test
index a4d1619..2df150b 100755
--- a/tests/hosts.test
+++ b/tests/hosts.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/implicit.test b/tests/implicit.test
index 961711b..210b2dc 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/include.test b/tests/include.test
index e7922df..350f8fc 100755
--- a/tests/include.test
+++ b/tests/include.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/include2.test b/tests/include2.test
index ea70b16..b028a2c 100755
--- a/tests/include2.test
+++ b/tests/include2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/info.test b/tests/info.test
index bcd40bf..2cde524 100755
--- a/tests/info.test
+++ b/tests/info.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/init.test b/tests/init.test
index 8eaf581..38ec681 100755
--- a/tests/init.test
+++ b/tests/init.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/insh2.test b/tests/insh2.test
index 766855d..c64f1f7 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/install2.test b/tests/install2.test
index 1024487..d1f27fe 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/installdir.test b/tests/installdir.test
index f920711..b09f495 100755
--- a/tests/installdir.test
+++ b/tests/installdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdat.test b/tests/instdat.test
index fc1d209..a6ec01a 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdat2.test b/tests/instdat2.test
index 115586f..966f0cf 100755
--- a/tests/instdat2.test
+++ b/tests/instdat2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 186871c..6adc82e 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
index 849b86a..475e935 100755
--- a/tests/instdir-lisp.test
+++ b/tests/instdir-lisp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 315d2a0..1fb4f37 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 14a910b..6a73b75 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-python.test b/tests/instdir-python.test
index d2cc586..2af2408 100755
--- a/tests/instdir-python.test
+++ b/tests/instdir-python.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
index 747dd31..50617c8 100755
--- a/tests/instdir-texi.test
+++ b/tests/instdir-texi.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir.test b/tests/instdir.test
index ceed66c..1132738 100755
--- a/tests/instdir.test
+++ b/tests/instdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instdir2.test b/tests/instdir2.test
index df22574..b0b78b7 100755
--- a/tests/instdir2.test
+++ b/tests/instdir2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instexec.test b/tests/instexec.test
index 36ed0f0..1312f8e 100755
--- a/tests/instexec.test
+++ b/tests/instexec.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instfail-info.test b/tests/instfail-info.test
index f2590f4..70d4657 100755
--- a/tests/instfail-info.test
+++ b/tests/instfail-info.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instfail-java.test b/tests/instfail-java.test
index 5df8a6d..2cb8afb 100755
--- a/tests/instfail-java.test
+++ b/tests/instfail-java.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instfail-libtool.test b/tests/instfail-libtool.test
index d7a78ae..1e756a6 100755
--- a/tests/instfail-libtool.test
+++ b/tests/instfail-libtool.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instfail.test b/tests/instfail.test
index 8b928cc..38a1c9c 100755
--- a/tests/instfail.test
+++ b/tests/instfail.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/insthook.test b/tests/insthook.test
index b9c48ed..5a82bd6 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instman.test b/tests/instman.test
index 07d1ca1..89c1a5e 100755
--- a/tests/instman.test
+++ b/tests/instman.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instman2.test b/tests/instman2.test
index b21d5ec..77844fa 100755
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
index c01d0da..fcee60b 100755
--- a/tests/instmany-mans.test
+++ b/tests/instmany-mans.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
index 1d0b91b..6831c9e 100755
--- a/tests/instmany-python.test
+++ b/tests/instmany-python.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instmany.test b/tests/instmany.test
index a1409dc..a3b10cb 100755
--- a/tests/instmany.test
+++ b/tests/instmany.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instsh.test b/tests/instsh.test
index c352285..61f5f9e 100755
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instsh2.test b/tests/instsh2.test
index 4a80843..778c1a3 100755
--- a/tests/instsh2.test
+++ b/tests/instsh2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instsh3.test b/tests/instsh3.test
index 0937a7a..b7b8761 100755
--- a/tests/instsh3.test
+++ b/tests/instsh3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/instspc.test b/tests/instspc.test
index a59177d..414b3e5 100755
--- a/tests/instspc.test
+++ b/tests/instspc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/interp.test b/tests/interp.test
index 797882b..af82e33 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/interp2.test b/tests/interp2.test
index d04637b..cff8d1d 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/java.test b/tests/java.test
index 939a793..d5210cd 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/java2.test b/tests/java2.test
index d3a0546..d3b942c 100755
--- a/tests/java2.test
+++ b/tests/java2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/java3.test b/tests/java3.test
index f2e592e..7895769 100755
--- a/tests/java3.test
+++ b/tests/java3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/javaprim.test b/tests/javaprim.test
index aa3d618..aa1506b 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/javasubst.test b/tests/javasubst.test
index f805218..d018645 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ldadd.test b/tests/ldadd.test
index a2a212b..005f9d8 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ldflags.test b/tests/ldflags.test
index fdb2965..39ca274 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lex.test b/tests/lex.test
index 584f94e..c59c4e3 100755
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lex2.test b/tests/lex2.test
index d9cde24..d588edf 100755
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lex3.test b/tests/lex3.test
index e44f5d5..59146c7 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lex4.test b/tests/lex4.test
index bab43b8..fee140d 100755
--- a/tests/lex4.test
+++ b/tests/lex4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lex5.test b/tests/lex5.test
index 604593c..edbdf9d 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libexec.test b/tests/libexec.test
index 8403dee..a6561b7 100755
--- a/tests/libexec.test
+++ b/tests/libexec.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj10.test b/tests/libobj10.test
index a5b8726..0d24741 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj11.test b/tests/libobj11.test
index 164db9c..204ff8b 100755
--- a/tests/libobj11.test
+++ b/tests/libobj11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj12.test b/tests/libobj12.test
index 5152c5c..5f1d029 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj13.test b/tests/libobj13.test
index ae0632c..6ca68c9 100755
--- a/tests/libobj13.test
+++ b/tests/libobj13.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj14.test b/tests/libobj14.test
index 1193c0b..ed20703 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 3dbe5ba..81b0e72 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 78af16a..0aeced9 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj4.test b/tests/libobj4.test
index 9e1360e..d6639be 100755
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj5.test b/tests/libobj5.test
index 48d417b..6add9e3 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj7.test b/tests/libobj7.test
index a00dfa2..73a8ab0 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libobj8.test b/tests/libobj8.test
index 9cdec3d..c06746b 100755
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/library.test b/tests/library.test
index 05518e6..1e2b58b 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/library2.test b/tests/library2.test
index 991135a..0dbff28 100755
--- a/tests/library2.test
+++ b/tests/library2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/library3.test b/tests/library3.test
index d459e1f..9d30d87 100755
--- a/tests/library3.test
+++ b/tests/library3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtoo10.test b/tests/libtoo10.test
index 78a4628..51a68d4 100755
--- a/tests/libtoo10.test
+++ b/tests/libtoo10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtoo11.test b/tests/libtoo11.test
index 030e2d3..850ca82 100755
--- a/tests/libtoo11.test
+++ b/tests/libtoo11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool.test b/tests/libtool.test
index f1da8f0..dd2a939 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool2.test b/tests/libtool2.test
index 3faa0b4..a50f6a4 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool3.test b/tests/libtool3.test
index c89f076..3427f28 100755
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool4.test b/tests/libtool4.test
index 4751d77..bcc9b0f 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool5.test b/tests/libtool5.test
index dcb5f96..c7f0476 100755
--- a/tests/libtool5.test
+++ b/tests/libtool5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool6.test b/tests/libtool6.test
index 1b8baa7..ad01b14 100755
--- a/tests/libtool6.test
+++ b/tests/libtool6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool7.test b/tests/libtool7.test
index 53e6326..a2f912f 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool8.test b/tests/libtool8.test
index 1306011..a1bb88a 100755
--- a/tests/libtool8.test
+++ b/tests/libtool8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/libtool9.test b/tests/libtool9.test
index c270537..c0d9688 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/license.test b/tests/license.test
index 42bd4d2..4a69791 100755
--- a/tests/license.test
+++ b/tests/license.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/license2.test b/tests/license2.test
index f16ed00..75f7811 100755
--- a/tests/license2.test
+++ b/tests/license2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index eae532d..37b27d7 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 9b449d5..7e73cc3 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index c3083e3..eeec3a6 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index ee22d59..4390bd6 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_fc.test b/tests/link_fc.test
index dcbf55d..5b23bd5 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index 2403cee..bd2b21d 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index 263e58a..e86f7cd 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp2.test b/tests/lisp2.test
index 02b3c9a..2fccdb2 100755
--- a/tests/lisp2.test
+++ b/tests/lisp2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp3.test b/tests/lisp3.test
index 11e3d0f..809d491 100755
--- a/tests/lisp3.test
+++ b/tests/lisp3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp4.test b/tests/lisp4.test
index 43bab6a..080ab3b 100755
--- a/tests/lisp4.test
+++ b/tests/lisp4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp5.test b/tests/lisp5.test
index 93d76e8..3a44b43 100755
--- a/tests/lisp5.test
+++ b/tests/lisp5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp6.test b/tests/lisp6.test
index eccd182..f386534 100755
--- a/tests/lisp6.test
+++ b/tests/lisp6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp7.test b/tests/lisp7.test
index 40ccb85..cf52527 100755
--- a/tests/lisp7.test
+++ b/tests/lisp7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 3e4981c..8a3edf2 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/listval.test b/tests/listval.test
index 0b2aeb5..5ff75db 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/location.test b/tests/location.test
index 4efaa72..13a2183 100755
--- a/tests/location.test
+++ b/tests/location.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/longlin2.test b/tests/longlin2.test
index 0dfa276..2d81afa 100755
--- a/tests/longlin2.test
+++ b/tests/longlin2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/longline.test b/tests/longline.test
index 7b5d307..aefd9a8 100755
--- a/tests/longline.test
+++ b/tests/longline.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltcond.test b/tests/ltcond.test
index 1febf2c..0350a3d 100755
--- a/tests/ltcond.test
+++ b/tests/ltcond.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
index 1d4bfca..1687513 100755
--- a/tests/ltcond2.test
+++ b/tests/ltcond2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltconv.test b/tests/ltconv.test
index 251c58b..0ec2132 100755
--- a/tests/ltconv.test
+++ b/tests/ltconv.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 77db501..8285bd1 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index db57e4f..bb3203a 100755
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index 1308e53..fd66473 100755
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index 98b87a6..2c9911d 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ltorder.test b/tests/ltorder.test
index 1d1e65e..0f69211 100755
--- a/tests/ltorder.test
+++ b/tests/ltorder.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/lzma.test b/tests/lzma.test
index 9cb4041..11bb93d 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/maintclean.test b/tests/maintclean.test
index 9814629..a66464b 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/make.test b/tests/make.test
index 06a1813..1e3184d 100755
--- a/tests/make.test
+++ b/tests/make.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/makej.test b/tests/makej.test
index 030a982..e5d55a1 100755
--- a/tests/makej.test
+++ b/tests/makej.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/check11.test b/tests/makej2.test
similarity index 61%
copy from tests/check11.test
copy to tests/makej2.test
index 2ee1145..e702999 100755
--- a/tests/check11.test
+++ b/tests/makej2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -14,40 +14,33 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check skip summary.
+# Test to make sure known BSD `make -jN' issues are fixed:
+# without -B, it may reuse the same shell for separate commands in a
+# rule, which can lead to interesting results.
. ./defs || Exit 1
set -e
-cat >> configure.in << 'END'
+cat >>configure.in <<'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS = skip skip2
+test-distdir-removed:
+ test ! -d $(distdir)
END
-cat >>skip <<'END'
-#! /bin/sh
-exit 77
-END
-chmod a+x skip
-cp skip skip2
-
$ACLOCAL
$AUTOCONF
-$AUTOMAKE -a
-
-unset TESTS || :
+$AUTOMAKE
-./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
-grep '1.*passed' stdout && Exit 1
+mkdir build
+cd build
+../configure "--prefix=`pwd`/inst"
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
-grep '2.*passed' stdout && Exit 1
+$MAKE -j2 || Exit 77
+$MAKE -j2 distcheck
+$MAKE test-distdir-removed
-:
+Exit 0
diff --git a/tests/maken.test b/tests/maken.test
index 8219ec6..8c78b97 100755
--- a/tests/maken.test
+++ b/tests/maken.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/maken2.test b/tests/maken2.test
index 4569375..97bf798 100755
--- a/tests/maken2.test
+++ b/tests/maken2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/maken3.test b/tests/maken3.test
index 7810649..b839d0d 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/maken4.test b/tests/maken4.test
index 689a3a9..ae5ce27 100755
--- a/tests/maken4.test
+++ b/tests/maken4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/makevars.test b/tests/makevars.test
index e0f1909..f4a80aa 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/man.test b/tests/man.test
index 6dfe7a8..93b3bb2 100755
--- a/tests/man.test
+++ b/tests/man.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/man2.test b/tests/man2.test
index 538f864..0027645 100755
--- a/tests/man2.test
+++ b/tests/man2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/man3.test b/tests/man3.test
index 436e2c2..b5afe0e 100755
--- a/tests/man3.test
+++ b/tests/man3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/man4.test b/tests/man4.test
index 558c880..aa86a9e 100755
--- a/tests/man4.test
+++ b/tests/man4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/man5.test b/tests/man5.test
index 626602a..437dc33 100755
--- a/tests/man5.test
+++ b/tests/man5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mclean.test b/tests/mclean.test
index d352999..dcbe818 100755
--- a/tests/mclean.test
+++ b/tests/mclean.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mdate.test b/tests/mdate.test
index 8068a23..704b393 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mdate2.test b/tests/mdate2.test
index 8497728..11b6d5d 100755
--- a/tests/mdate2.test
+++ b/tests/mdate2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 07da781..75105f9 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mdate4.test b/tests/mdate4.test
index 4b35d45..ca24f56 100755
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mdate5.test b/tests/mdate5.test
index ce9f7db..c9140b6 100755
--- a/tests/mdate5.test
+++ b/tests/mdate5.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing.test b/tests/missing.test
index 911a552..eaf6f54 100755
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing2.test b/tests/missing2.test
index bf6111f..2629198 100755
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing3.test b/tests/missing3.test
index c917363..07ef779 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing4.test b/tests/missing4.test
index 6842040..1015828 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing5.test b/tests/missing5.test
index f3773cc..a96e14e 100755
--- a/tests/missing5.test
+++ b/tests/missing5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/missing6.test b/tests/missing6.test
index 15767b0..b63a0d1 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index e066767..359f562 100755
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mkinst3.test b/tests/mkinst3.test
index c1e8430..18f18fb 100755
--- a/tests/mkinst3.test
+++ b/tests/mkinst3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mkinstall.test b/tests/mkinstall.test
index 843cb76..4a65307 100755
--- a/tests/mkinstall.test
+++ b/tests/mkinstall.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mmode.test b/tests/mmode.test
index 1f3e591..19f83f1 100755
--- a/tests/mmode.test
+++ b/tests/mmode.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/mmodely.test b/tests/mmodely.test
index 2173523..0f9bb3b 100755
--- a/tests/mmodely.test
+++ b/tests/mmodely.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/multlib.test b/tests/multlib.test
index e2857a7..65b3fd4 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test
index 4da415b..12b055e 100755
--- a/tests/nobase-libtool.test
+++ b/tests/nobase-libtool.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nobase-python.test b/tests/nobase-python.test
index e7e857e..db5b830 100755
--- a/tests/nobase-python.test
+++ b/tests/nobase-python.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nobase.test b/tests/nobase.test
index 3dbc2b1..8b0dc6e 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodef.test b/tests/nodef.test
index 1477f1c..1a58bb7 100755
--- a/tests/nodef.test
+++ b/tests/nodef.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodef2.test b/tests/nodef2.test
index 65c77c9..5a6c0ee 100755
--- a/tests/nodef2.test
+++ b/tests/nodef2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodep.test b/tests/nodep.test
index 60bf282..31232f2 100755
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodep2.test b/tests/nodep2.test
index 8cd8d42..53bcaad 100755
--- a/tests/nodep2.test
+++ b/tests/nodep2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index e578a59..53b902e 100755
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodist.test b/tests/nodist.test
index 50e5523..7239338 100755
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodist2.test b/tests/nodist2.test
index 80a89c7..3d9e6ce 100755
--- a/tests/nodist2.test
+++ b/tests/nodist2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 9f830fc..21cfec3 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nogzip.test b/tests/nogzip.test
index c1429e0..77adcdc 100755
--- a/tests/nogzip.test
+++ b/tests/nogzip.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nogzip2.test b/tests/nogzip2.test
index 338754f..f6e01ab 100755
--- a/tests/nogzip2.test
+++ b/tests/nogzip2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/noinst.test b/tests/noinst.test
index a59816f..dd97481 100755
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 9395795..3f33c32 100755
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nolink.test b/tests/nolink.test
index dbfeee8..5e42076 100755
--- a/tests/nolink.test
+++ b/tests/nolink.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index bda7523..96e30c5 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/notrans.test b/tests/notrans.test
index e00566c..d3ee2b2 100755
--- a/tests/notrans.test
+++ b/tests/notrans.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/number.test b/tests/number.test
index 6a0887d..a43ff2f 100755
--- a/tests/number.test
+++ b/tests/number.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/objc.test b/tests/objc.test
index 5c04a27..facc4d4 100755
--- a/tests/objc.test
+++ b/tests/objc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/objc2.test b/tests/objc2.test
index cc1d2c4..9931ef7 100755
--- a/tests/objc2.test
+++ b/tests/objc2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/obsolete.test b/tests/obsolete.test
index 53e4261..e6601c9 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/order.test b/tests/order.test
index e56035b..0f39b79 100755
--- a/tests/order.test
+++ b/tests/order.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/outdir.test b/tests/outdir.test
index e534ce1..4bafb4e 100755
--- a/tests/outdir.test
+++ b/tests/outdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output-order.test b/tests/output-order.test
index 8e0e5a4..856baa2 100755
--- a/tests/output-order.test
+++ b/tests/output-order.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output.test b/tests/output.test
index 6165871..4f6a7cd 100755
--- a/tests/output.test
+++ b/tests/output.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output10.test b/tests/output10.test
index acaf29c..a973559 100755
--- a/tests/output10.test
+++ b/tests/output10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output11.test b/tests/output11.test
index 4d5ccea..9d5328b 100755
--- a/tests/output11.test
+++ b/tests/output11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output12.test b/tests/output12.test
index b26fc0d..2f8027c 100755
--- a/tests/output12.test
+++ b/tests/output12.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output13.test b/tests/output13.test
index 23f997d..c862f07 100755
--- a/tests/output13.test
+++ b/tests/output13.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output2.test b/tests/output2.test
index 1a42c43..c9bdbc3 100755
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output3.test b/tests/output3.test
index 997e548..02d7e6f 100755
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output4.test b/tests/output4.test
index ebd3548..fc5a022 100755
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output5.test b/tests/output5.test
index 80d8e79..4323f62 100755
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output6.test b/tests/output6.test
index e7bef43..88daa74 100755
--- a/tests/output6.test
+++ b/tests/output6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output7.test b/tests/output7.test
index fbb9d52..878c091 100755
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output8.test b/tests/output8.test
index 3e34070..1c11a16 100755
--- a/tests/output8.test
+++ b/tests/output8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/output9.test b/tests/output9.test
index 6da79be..d4cf15a 100755
--- a/tests/output9.test
+++ b/tests/output9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/overrid.test b/tests/overrid.test
index 555b96f..df453ca 100755
--- a/tests/overrid.test
+++ b/tests/overrid.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index e2101e5..4aef628 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
index 9e002ba..20225a0 100755
--- a/tests/parallel-am2.test
+++ b/tests/parallel-am2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index 11e4706..5db9c67 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index c2ff258..385cef3 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests10.test
similarity index 76%
copy from tests/parallel-tests6.test
copy to tests/parallel-tests10.test
index 59a0b0e..2642c7a 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check parallel-tests features:
-# - empty TESTS
-# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
+# - trailing whitespace in TESTS
+# GNU make 3.80 may expand trailing white space to `.log'.
. ./defs-p || Exit 1
set -e
@@ -26,18 +26,22 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS =
+TESTS = foo $(BAR)
+BAR =
END
+cat >foo <<'END'
+#! /bin/sh
+exit 0
+END
+
+chmod +x ./foo
+
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep '0 tests' stdout
+$MAKE check
Exit 0
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index 2a5fc6f..5101e47 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index 8d3cda0..d631d67 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests4.test b/tests/parallel-tests4.test
index ca3e18b..d842486 100755
--- a/tests/parallel-tests4.test
+++ b/tests/parallel-tests4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index f109cc2..a7bbc9e 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index 59a0b0e..5dbb433 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -17,6 +17,7 @@
# Check parallel-tests features:
# - empty TESTS
# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
+# See parallel-tests10.test for a similar issue.
. ./defs-p || Exit 1
set -e
diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test
index ea9c2d4..c2ae63a 100755
--- a/tests/parallel-tests7.test
+++ b/tests/parallel-tests7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 309a2cf..2c27064 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index a0cb585..300a2f0 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/parse.test b/tests/parse.test
index 80638da..e7dcbe5 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/percent.test b/tests/percent.test
index fd95c89..40f9a43 100755
--- a/tests/percent.test
+++ b/tests/percent.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/percent2.test b/tests/percent2.test
index beabc93..f7c7f14 100755
--- a/tests/percent2.test
+++ b/tests/percent2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/phony.test b/tests/phony.test
index 4dee64f..0f57915 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq.test b/tests/pluseq.test
index 7b0b89e..05a5fce 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index 3324cba..5548e6d 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index a7fdc56..28f9848 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 523d970..64ddd69 100755
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 7ab4938..febc33b 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index ed6ee83..1f1c98c 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index d67e69f..bb546cf 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index 367c0df..f74e62c 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index 25b226b..a39059a 100755
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index a10c761..31e1c8d 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/postproc.test b/tests/postproc.test
index dff60fc..197f267 100755
--- a/tests/postproc.test
+++ b/tests/postproc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/ppf77.test b/tests/ppf77.test
index 61cbf16..6c61a2e 100755
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr2.test b/tests/pr2.test
index cc4fbbd..258a8ef 100755
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr204.test b/tests/pr204.test
index 19a0ef6..2944449 100755
--- a/tests/pr204.test
+++ b/tests/pr204.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr211.test b/tests/pr211.test
index 9dd6e1f..9344fd2 100755
--- a/tests/pr211.test
+++ b/tests/pr211.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr220.test b/tests/pr220.test
index 2401e59..25e1f0e 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr224.test b/tests/pr224.test
index 5609c82..fdcb997 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr229.test b/tests/pr229.test
index c9ce9d5..a97ef4f 100755
--- a/tests/pr229.test
+++ b/tests/pr229.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr243.test b/tests/pr243.test
index 516665e..a3fdb8e 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr266.test b/tests/pr266.test
index 2b4ca1f..865369f 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 3820574..1d1e675 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr279.test b/tests/pr279.test
index 6a062dc..b7ec641 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr287.test b/tests/pr287.test
index 1055921..58553b5 100755
--- a/tests/pr287.test
+++ b/tests/pr287.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index d813437..3d2fde5 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index 63078bb..01814a9 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
index dd72448..0b226c6 100755
--- a/tests/pr300-prog.test
+++ b/tests/pr300-prog.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr307.test b/tests/pr307.test
index b3b35ee..0091415 100755
--- a/tests/pr307.test
+++ b/tests/pr307.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr401.test b/tests/pr401.test
index 008c277..7a092bf 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr401b.test b/tests/pr401b.test
index 8119818..f7f6344 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr401c.test b/tests/pr401c.test
index cfb6813..fc2f5de 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr72.test b/tests/pr72.test
index 804694b..d67c17b 100755
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr87.test b/tests/pr87.test
index a656e06..369849b 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/pr9.test b/tests/pr9.test
index fa72ad1..dab9734 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/prefix.test b/tests/prefix.test
index 8e23d47..8199bd4 100755
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/primary.test b/tests/primary.test
index e00b311..ac5e54f 100755
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/primary2.test b/tests/primary2.test
index f22e87d..faa7aed 100755
--- a/tests/primary2.test
+++ b/tests/primary2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/primary3.test b/tests/primary3.test
index fdb28c9..578d053 100755
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/proginst.test b/tests/proginst.test
index 9d7a4d7..8881b9d 100755
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python.test b/tests/python.test
index e690a8b..8102ca0 100755
--- a/tests/python.test
+++ b/tests/python.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python10.test b/tests/python10.test
index 1bfd4da..ff0ee15 100755
--- a/tests/python10.test
+++ b/tests/python10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python11.test b/tests/python11.test
index b95e31b..0f15f37 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python12.test b/tests/python12.test
index 0f57d02..2f52dfc 100755
--- a/tests/python12.test
+++ b/tests/python12.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python2.test b/tests/python2.test
index 3156f4d..7768e81 100755
--- a/tests/python2.test
+++ b/tests/python2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python3.test b/tests/python3.test
index 5e299c7..f01ad31 100755
--- a/tests/python3.test
+++ b/tests/python3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python4.test b/tests/python4.test
index 770bf50..11bb3ed 100755
--- a/tests/python4.test
+++ b/tests/python4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python5.test b/tests/python5.test
index af79377..86f5863 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python6.test b/tests/python6.test
index 7968692..eb4fb4d 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python7.test b/tests/python7.test
index b3fb8e7..62c1a1b 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python8.test b/tests/python8.test
index 902a6d2..a50af22 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/python9.test b/tests/python9.test
index 372aa79..9b23deb 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/recurs.test b/tests/recurs.test
index 4467aee..026fb0d 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/recurs2.test b/tests/recurs2.test
index 46cebd7..5062bf0 100755
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/regex.test b/tests/regex.test
index 43b1b15..babd92a 100755
--- a/tests/regex.test
+++ b/tests/regex.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake.test b/tests/remake.test
index 2abd7f2..9c86b1b 100755
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake2.test b/tests/remake2.test
index 649ca49..3b63dea 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake3.test b/tests/remake3.test
index 92912f8..08ec16a 100755
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake4.test b/tests/remake4.test
index 9031c70..d6dbed7 100755
--- a/tests/remake4.test
+++ b/tests/remake4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake5.test b/tests/remake5.test
index 847c549..d353632 100755
--- a/tests/remake5.test
+++ b/tests/remake5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake6.test b/tests/remake6.test
index a1b9fbe..a25e486 100755
--- a/tests/remake6.test
+++ b/tests/remake6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/remake7.test b/tests/remake7.test
index 2752c26..670f60b 100755
--- a/tests/remake7.test
+++ b/tests/remake7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/req.test b/tests/req.test
index 4008ae0..39bf349 100755
--- a/tests/req.test
+++ b/tests/req.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/reqd.test b/tests/reqd.test
index f2880b1..58a8839 100755
--- a/tests/reqd.test
+++ b/tests/reqd.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/reqd2.test b/tests/reqd2.test
index 0c64ce1..b47ef15 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/rulepat.test b/tests/rulepat.test
index d38592f..c15e910 100755
--- a/tests/rulepat.test
+++ b/tests/rulepat.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/sanity.test b/tests/sanity.test
index 0d3830d..1c96c78 100755
--- a/tests/sanity.test
+++ b/tests/sanity.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/scripts.test b/tests/scripts.test
index d749a18..6d3f0e8 100755
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/seenc.test b/tests/seenc.test
index 8a6f157..3bfac37 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent.test b/tests/silent.test
index 73d6bff..70fcaae 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent2.test b/tests/silent2.test
index a208151..e0b0935 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent3.test b/tests/silent3.test
index c1266b7..70023ec 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent4.test b/tests/silent4.test
index 7f96f60..37e690c 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent5.test b/tests/silent5.test
index 08c22d8..8d517be 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent6.test b/tests/silent6.test
index 1f6a718..e6f08dd 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/silent7.test b/tests/silent7.test
index cca2644..e953605 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/sinclude.test b/tests/sinclude.test
index 6b614fa..cc8898b 100755
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/space.test b/tests/space.test
index a8d3660..a4ab5a8 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg.test b/tests/specflg.test
index 388af22..b9b2e10 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg10.test b/tests/specflg10.test
index b7d8442..efe13f5 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
@@ -16,6 +16,7 @@
# AM_DEFAULT_SOURCE_EXT
+required=g++
. ./defs || Exit 1
set -e
diff --git a/tests/specflg2.test b/tests/specflg2.test
index 71208da..0dc7fcc 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg3.test b/tests/specflg3.test
index e49e54e..53793a1 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg6.test b/tests/specflg6.test
index d7b9938..d858769 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg7.test b/tests/specflg7.test
index b652a5a..067a36d 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg8.test b/tests/specflg8.test
index cb913fb..1abcaa2 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/specflg9.test b/tests/specflg9.test
index 9f83356..7f92046 100755
--- a/tests/specflg9.test
+++ b/tests/specflg9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/spell.test b/tests/spell.test
index 6ec30ba..d880a62 100755
--- a/tests/spell.test
+++ b/tests/spell.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/spell2.test b/tests/spell2.test
index 0caf39d..54298f1 100755
--- a/tests/spell2.test
+++ b/tests/spell2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/spell3.test b/tests/spell3.test
index 9910a25..399328f 100755
--- a/tests/spell3.test
+++ b/tests/spell3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/spelling.test b/tests/spelling.test
index 292d05e..ad1e232 100755
--- a/tests/spelling.test
+++ b/tests/spelling.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/spy.test b/tests/spy.test
index ac714aa..c4993c6 100755
--- a/tests/spy.test
+++ b/tests/spy.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/srcsub.test b/tests/srcsub.test
index dada60f..2f38312 100755
--- a/tests/srcsub.test
+++ b/tests/srcsub.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
index 014a30a..494d0f6 100755
--- a/tests/srcsub2.test
+++ b/tests/srcsub2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/stamph2.test b/tests/stamph2.test
index dfcc665..cb96d27 100755
--- a/tests/stamph2.test
+++ b/tests/stamph2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/stdinc.test b/tests/stdinc.test
index a8ed6a5..ff914f3 100755
--- a/tests/stdinc.test
+++ b/tests/stdinc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/stdlib.test b/tests/stdlib.test
index 92a14da..48f56fc 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
index dc27f36..c5d543c 100755
--- a/tests/stdlib2.test
+++ b/tests/stdlib2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/strip.test b/tests/strip.test
index ddaab76..3dcddaf 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subcond.test b/tests/subcond.test
index 0e1bedb..b04c475 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subcond2.test b/tests/subcond2.test
index b2f58b7..5086cd3 100755
--- a/tests/subcond2.test
+++ b/tests/subcond2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subcond3.test b/tests/subcond3.test
index 3b7f501..3506d05 100755
--- a/tests/subcond3.test
+++ b/tests/subcond3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir.test b/tests/subdir.test
index 772d524..85db059 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir2.test b/tests/subdir2.test
index cfd42e8..aa83436 100755
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir3.test b/tests/subdir3.test
index eb67afc..aa02be0 100755
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir4.test b/tests/subdir4.test
index c0a5413..2f85213 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir5.test b/tests/subdir5.test
index bcf4883..1bfee41 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir6.test b/tests/subdir6.test
index a0127c1..81221ff 100755
--- a/tests/subdir6.test
+++ b/tests/subdir6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir7.test b/tests/subdir7.test
index bcb3403..e72f489 100755
--- a/tests/subdir7.test
+++ b/tests/subdir7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir8.test b/tests/subdir8.test
index 9ad4a5c..97f7d42 100755
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdir9.test b/tests/subdir9.test
index 3a4878e..4346326 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
index 3737ddb..8fe506a 100755
--- a/tests/subdirbuiltsources.test
+++ b/tests/subdirbuiltsources.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj.test b/tests/subobj.test
index 259303a..df297f4 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj10.test b/tests/subobj10.test
index 515805d..c9c129d 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj2.test b/tests/subobj2.test
index c96e753..1282f80 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj3.test b/tests/subobj3.test
index ac8a470..a4ba765 100755
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj4.test b/tests/subobj4.test
index 38b4dc6..f98ae5b 100755
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj5.test b/tests/subobj5.test
index d2b4cbc..9c9568a 100755
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj6.test b/tests/subobj6.test
index a7cf59d..42b6e14 100755
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj7.test b/tests/subobj7.test
index 4b89c79..d77670c 100755
--- a/tests/subobj7.test
+++ b/tests/subobj7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj8.test b/tests/subobj8.test
index 2aa0a93..63a02d1 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 1275256..99fe6e8 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subobjname.test b/tests/subobjname.test
index c474a41..79584cf 100755
--- a/tests/subobjname.test
+++ b/tests/subobjname.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subpkg.test b/tests/subpkg.test
index aa682a9..3662937 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subpkg2.test b/tests/subpkg2.test
index 51bb32b..ebbc69b 100755
--- a/tests/subpkg2.test
+++ b/tests/subpkg2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subpkg3.test b/tests/subpkg3.test
index 3e9e824..d57ee37 100755
--- a/tests/subpkg3.test
+++ b/tests/subpkg3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subpkg3.test b/tests/subpkg4.test
similarity index 54%
copy from tests/subpkg3.test
copy to tests/subpkg4.test
index 3e9e824..8e8371b 100755
--- a/tests/subpkg3.test
+++ b/tests/subpkg4.test
@@ -1,9 +1,9 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
#
# This 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 3, or (at your option)
+# 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,
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# make sure different subpackages may share files and directories.
+# Test to ensure `distdir' fixes the mode of files and directories
+# copied into `$(distdir)', even with sub-packages.
. ./defs || Exit 1
@@ -22,7 +23,17 @@ set -e
cat >Makefile.am <<'END'
SUBDIRS = subpkg
-EXTRA_DIST = subpkg/foobar
+test-distdir-is-readable:
+ bad_dirs=`find $(distdir) -type d ! -perm -777 -print`; \
+ if test -n "$$bad_dirs"; then \
+ echo "directories not permissive: $$bad_dirs" >&2; \
+ exit 1; \
+ fi
+ bad_files=`find $(distdir) ! -type d ! -perm -444 -print`; \
+ if test -n "$$bad_files"; then \
+ echo "file not permissive: $$bad_files" >&2; \
+ exit 1; \
+ fi
END
cat >>configure.in <<'END'
@@ -30,11 +41,15 @@ AC_CONFIG_SUBDIRS([subpkg])
AC_OUTPUT
END
-mkdir subpkg
-
+mkdir subpkg subpkg/dir
echo foobar >subpkg/foobar
+echo baz > subpkg/dir/baz
+
+chmod go-rwx subpkg/foobar subpkg/dir/baz subpkg/dir
-echo SUBDIRS = >subpkg/Makefile.am
+cat >subpkg/Makefile.am <<'END'
+EXTRA_DIST = foobar dir
+END
cat >subpkg/configure.in <<'END'
AC_INIT([subpkg], [1.0])
@@ -54,4 +69,5 @@ $AUTOCONF
cd ..
./configure
-$MAKE distcheck
+$MAKE distdir
+$MAKE test-distdir-is-readable
diff --git a/tests/subst.test b/tests/subst.test
index 1dde9b8..7d45dae 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subst2.test b/tests/subst2.test
index b4f4bb9..2bbabdd 100755
--- a/tests/subst2.test
+++ b/tests/subst2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subst3.test b/tests/subst3.test
index 2f01908..1bcb170 100755
--- a/tests/subst3.test
+++ b/tests/subst3.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/subst4.test b/tests/subst4.test
index 02e46bd..5f3fdd6 100755
--- a/tests/subst4.test
+++ b/tests/subst4.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/substre2.test b/tests/substre2.test
index f44c820..30e7c94 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/substref.test b/tests/substref.test
index f8ded57..41d782a 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/substtarg.test b/tests/substtarg.test
index 1d5c577..7d5e098 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix.test b/tests/suffix.test
index 2089fb8..b77e19d 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix10.test b/tests/suffix10.test
index 8f5c706..85525d0 100755
--- a/tests/suffix10.test
+++ b/tests/suffix10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix11.test b/tests/suffix11.test
index e841ece..e38926a 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix12.test b/tests/suffix12.test
index 77e08ca..e2a8c44 100755
--- a/tests/suffix12.test
+++ b/tests/suffix12.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix2.test b/tests/suffix2.test
index c83a7b1..59a72f4 100755
--- a/tests/suffix2.test
+++ b/tests/suffix2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix3.test b/tests/suffix3.test
index 2a26128..1e8a00d 100755
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix4.test b/tests/suffix4.test
index 8f36935..b1d6068 100755
--- a/tests/suffix4.test
+++ b/tests/suffix4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix5.test b/tests/suffix5.test
index a25bcc1..1fd55d3 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix6.test b/tests/suffix6.test
index 934cc09..79759d6 100755
--- a/tests/suffix6.test
+++ b/tests/suffix6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix7.test b/tests/suffix7.test
index 22f3874..170660b 100755
--- a/tests/suffix7.test
+++ b/tests/suffix7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix8.test b/tests/suffix8.test
index ce7d3f9..fd12a0a 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/suffix9.test b/tests/suffix9.test
index 8462243..5b2407f 100755
--- a/tests/suffix9.test
+++ b/tests/suffix9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/symlink.test b/tests/symlink.test
index 51d010f..a9b12c5 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/symlink2.test b/tests/symlink2.test
index a64b6db..cb2cd30 100755
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/symlink3.test b/tests/symlink3.test
index 6b0585d..12cb714 100755
--- a/tests/symlink3.test
+++ b/tests/symlink3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/syntax.test b/tests/syntax.test
index 11fe81f..505486f 100755
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/tags.test b/tests/tags.test
index 22d1f0f..055989f 100755
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/tagsub.test b/tests/tagsub.test
index a710840..bcf752d 100755
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/tar.test b/tests/tar.test
index 97dec38..dc5353c 100755
--- a/tests/tar.test
+++ b/tests/tar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/tar2.test b/tests/tar2.test
index 3f03c98..e62f0cc 100755
--- a/tests/tar2.test
+++ b/tests/tar2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/tar3.test b/tests/tar3.test
index 0ba0612..de66754 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index 14ca79d..d0f83f3 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/targetclash.test b/tests/targetclash.test
index 57515a5..0433b41 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/transform.test b/tests/transform.test
index a5f4730..02fdd61 100755
--- a/tests/transform.test
+++ b/tests/transform.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/transform2.test b/tests/transform2.test
index f1faa94..0f9d5ec 100755
--- a/tests/transform2.test
+++ b/tests/transform2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo.test b/tests/txinfo.test
index 9b37eb5..3f1c533 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo10.test b/tests/txinfo10.test
index fc82693..7432c7f 100755
--- a/tests/txinfo10.test
+++ b/tests/txinfo10.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
index e8601f0..81b39e4 100755
--- a/tests/txinfo13.test
+++ b/tests/txinfo13.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo16.test b/tests/txinfo16.test
index a82cb27..66ed686 100755
--- a/tests/txinfo16.test
+++ b/tests/txinfo16.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo17.test b/tests/txinfo17.test
index f02aeee..62408be 100755
--- a/tests/txinfo17.test
+++ b/tests/txinfo17.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
index bc66918..4df5257 100755
--- a/tests/txinfo18.test
+++ b/tests/txinfo18.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo19.test b/tests/txinfo19.test
index a470306..aabe4be 100755
--- a/tests/txinfo19.test
+++ b/tests/txinfo19.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
index 2f1dafe..2324f57 100755
--- a/tests/txinfo2.test
+++ b/tests/txinfo2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo20.test b/tests/txinfo20.test
index 85a8260..5f6de57 100755
--- a/tests/txinfo20.test
+++ b/tests/txinfo20.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index c94f798..4bbce4a 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index f90a02b..3c2265d 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo23.test b/tests/txinfo23.test
index 73875af..903e681 100755
--- a/tests/txinfo23.test
+++ b/tests/txinfo23.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo24.test b/tests/txinfo24.test
index 9c81b41..4c0bc82 100755
--- a/tests/txinfo24.test
+++ b/tests/txinfo24.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo25.test b/tests/txinfo25.test
index c2e111d..85007f9 100755
--- a/tests/txinfo25.test
+++ b/tests/txinfo25.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo26.test b/tests/txinfo26.test
index 87b4ba6..e5e8f84 100755
--- a/tests/txinfo26.test
+++ b/tests/txinfo26.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
index 48b06d6..0769fa5 100755
--- a/tests/txinfo27.test
+++ b/tests/txinfo27.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo28.test b/tests/txinfo28.test
index 02805ca..1fd702b 100755
--- a/tests/txinfo28.test
+++ b/tests/txinfo28.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index 29116c2..1d4aeff 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo3.test b/tests/txinfo3.test
index 367547e..dcdfcfa 100755
--- a/tests/txinfo3.test
+++ b/tests/txinfo3.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo30.test b/tests/txinfo30.test
index 35a9a34..8db42d9 100755
--- a/tests/txinfo30.test
+++ b/tests/txinfo30.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo31.test b/tests/txinfo31.test
index 4c061a5..cb8df94 100755
--- a/tests/txinfo31.test
+++ b/tests/txinfo31.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo32.test b/tests/txinfo32.test
index 267c0e9..6b63ad8 100755
--- a/tests/txinfo32.test
+++ b/tests/txinfo32.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo33.test b/tests/txinfo33.test
index 38adb1e..4657a94 100755
--- a/tests/txinfo33.test
+++ b/tests/txinfo33.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo4.test b/tests/txinfo4.test
index f3ec9f0..1c6a92f 100755
--- a/tests/txinfo4.test
+++ b/tests/txinfo4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index bc6214e..0bbc7d9 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo6.test b/tests/txinfo6.test
index 33c066b..ad3704e 100755
--- a/tests/txinfo6.test
+++ b/tests/txinfo6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo7.test b/tests/txinfo7.test
index 09b4f4c..466a216 100755
--- a/tests/txinfo7.test
+++ b/tests/txinfo7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index 027ce72..7975b28 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/txinfo9.test b/tests/txinfo9.test
index 6959c6c..b9eb7b5 100755
--- a/tests/txinfo9.test
+++ b/tests/txinfo9.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/unused.test b/tests/unused.test
index 6d1f764..a5b4da6 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/upc.test b/tests/upc.test
index 07c864e..3c55ccb 100755
--- a/tests/upc.test
+++ b/tests/upc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/upc2.test b/tests/upc2.test
index c096b73..6b717fd 100755
--- a/tests/upc2.test
+++ b/tests/upc2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/upc3.test b/tests/upc3.test
index d85709b..f575b9a 100755
--- a/tests/upc3.test
+++ b/tests/upc3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vala.test b/tests/vala.test
index a0e97ad..3e9ae36 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -6,7 +6,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/vala1.test b/tests/vala1.test
index 158adcf..d0cc241 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -6,7 +6,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/vala2.test b/tests/vala2.test
index a6efba9..e559540 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -6,7 +6,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
@@ -21,7 +21,7 @@
# Test to make sure compiling Vala code really works with recursive make.
-required="libtool libtoolize pkg-config valac gcc"
+required="libtool libtoolize pkg-config valac gcc GNUmake"
. ./defs || Exit 1
set -e
@@ -44,6 +44,7 @@ END
cat > 'src/Makefile.am' <<'END'
bin_PROGRAMS = zardoz
+zardoz_VALAFLAGS = -H zardoz.h
zardoz_CFLAGS = $(GOBJECT_CFLAGS)
zardoz_LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = zardoz.vala
@@ -67,6 +68,11 @@ $AUTOMAKE -a
./configure || Exit 77
$MAKE
+
+# test rebuild rules
+rm -f src/zardoz.h
+$MAKE -C src zardoz.h
+
$MAKE distcheck
$MAKE distclean
mkdir build
@@ -75,3 +81,7 @@ cd build
$MAKE
$MAKE distcheck
+# test rebuild rules from builddir
+touch ../src/zardoz.vala
+$MAKE
+
diff --git a/tests/vala3.test b/tests/vala3.test
index 7815393..138e853 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -6,7 +6,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
@@ -21,7 +21,7 @@
# Test to make sure compiling Vala code really works with non-recursive make.
-required="libtool libtoolize pkg-config valac gcc"
+required="libtool libtoolize pkg-config valac gcc GNUmake"
. ./defs || Exit 1
set -e
diff --git a/tests/vala4.test b/tests/vala4.test
index 1f9d2ca..4301d45 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -5,7 +5,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
diff --git a/tests/vala5.test b/tests/vala5.test
index 7369186..8fc703c 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -6,7 +6,7 @@
#
# GNU Automake 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 3, or (at your option)
+# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
@@ -19,9 +19,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-# Test per-target flags, expected to fail.
+# Test per-target flags.
-required="libtool libtoolize pkg-config valac gcc"
+required="libtool libtoolize pkg-config valac gcc GNUmake"
. ./defs || Exit 1
set -e
@@ -32,7 +32,7 @@ cat >> 'configure.in' << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_LIBTOOL
-AM_PROG_VALAC
+AM_PROG_VALAC([0.7.0])
PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
AC_CONFIG_FILES([src/Makefile])
AC_OUTPUT
@@ -69,6 +69,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure
+./configure || Exit 77
$MAKE
diff --git a/tests/vars.test b/tests/vars.test
index b69244c..ae711b0 100755
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vars3.test b/tests/vars3.test
index 4eb2e64..3d10a90 100755
--- a/tests/vars3.test
+++ b/tests/vars3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vartar.test b/tests/vartar.test
index d0443af..3a18d77 100755
--- a/tests/vartar.test
+++ b/tests/vartar.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version.test b/tests/version.test
index 731baf5..bfa3f43 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version2.test b/tests/version2.test
index 4ef460f..993c0ba 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version3.test b/tests/version3.test
index 5738713..b7d356d 100755
--- a/tests/version3.test
+++ b/tests/version3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version4.test b/tests/version4.test
index 63f3c28..9ec0cba 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version6.test b/tests/version6.test
index b84a57d..6993c06 100755
--- a/tests/version6.test
+++ b/tests/version6.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version7.test b/tests/version7.test
index 91f7a99..4df84ed 100755
--- a/tests/version7.test
+++ b/tests/version7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/version8.test b/tests/version8.test
index 250ec17..91b11a0 100755
--- a/tests/version8.test
+++ b/tests/version8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vpath.test b/tests/vpath.test
index fd85de6..850aaeb 100755
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vtexi.test b/tests/vtexi.test
index 2e43563..c28a356 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index 8ab4afe..633fe13 100755
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/warnopts.test b/tests/warnopts.test
index 0a3201f..6d96400 100755
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/werror.test b/tests/werror.test
index cf5d28f..5c7a0b5 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/werror2.test b/tests/werror2.test
index 2d64bcb..d55b015 100755
--- a/tests/werror2.test
+++ b/tests/werror2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/whoami.test b/tests/whoami.test
index 2436d07..f2dcab1 100755
--- a/tests/whoami.test
+++ b/tests/whoami.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/xsource.test b/tests/xsource.test
index 54e3e1e..df140a5 100755
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/xz.test b/tests/xz.test
index 299ce1f..f442711 100755
--- a/tests/xz.test
+++ b/tests/xz.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc.test b/tests/yacc.test
index c96e59d..bf6782f 100755
--- a/tests/yacc.test
+++ b/tests/yacc.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc2.test b/tests/yacc2.test
index a97bf2d..a095edc 100755
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc3.test b/tests/yacc3.test
index 6452325..86d897c 100755
--- a/tests/yacc3.test
+++ b/tests/yacc3.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc4.test b/tests/yacc4.test
index db8eaef..0435ec0 100755
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc5.test b/tests/yacc5.test
index 905d5eb..8b00ed8 100755
--- a/tests/yacc5.test
+++ b/tests/yacc5.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc6.test b/tests/yacc6.test
index cd383a1..f10effd 100755
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -4,7 +4,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc7.test b/tests/yacc7.test
index a3e21b7..2edd15c 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yacc8.test b/tests/yacc8.test
index 89eb3b7..979415c 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yaccpp.test b/tests/yaccpp.test
index e311dd7..9013f40 100755
--- a/tests/yaccpp.test
+++ b/tests/yaccpp.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 18a0dec..6db5fd7 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -3,7 +3,7 @@
#
# This 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 3, or (at your option)
+# 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,
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-85-ge33c68a,
Ralf Wildenhues <=