Merge branch 'dr-cscope'

* dr-cscope:
  Fix license headers of cscope tests to be GPLv2+.

diff --cc ChangeLog
index 7362983,7402675..717578e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,98 -1,10 +1,103 @@@
  2009-10-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
+       Fix license headers of cscope tests to be GPLv2+.
+       * tests/cscope.test: Revert to GPL version 2.
+       * tests/cscope2.test: Likewise.
+       * tests/cscope3.test: Likewise.
+ 
 +      Sync auxiliary files from upstream.
 +      * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
 +      lib/texinfo.tex: Sync from upstream.
 +
 +      Doc and comment typos.
 +      * automake.in (handle_ltlibraries): Fix typo in comment.
 +      * tests/distcom7.test: Likewise.
 +      * tests/lisp5.test: Likewise.
 +      * doc/automake.texi (Usage of Conditionals): Fix typo.
 +
 +2009-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix race condition in werror2.test due to sanity sleep change.
 +      * tests/werror2.test: Generate Makefile.in before configure so
 +      that a Makefile.am update after configure has run is guaranteed
 +      to be newer than Makefile.in.
 +      * tests/subdir5.test: Document why this test does not need to be
 +      fixed.
 +      * tests/subdir8.test: Likewise.
 +
 +      Improve description of the various *LINK variables.
 +      * doc/automake.texi (Program and Library Variables): _LINK also
 +      receives libraries to link against.  _LINK may be generated.
 +      (Program Variables): Document reasons when per-target _LINK is
 +      used instead of LINK.
 +      (How the Linker is Chosen): Document how a per-target _LINK
 +      variable and per-target link flags override linker selection.
 +      * THANKS: Update.
 +      Report by Dave Korn against gcc/libstdc++-v3.
 +
 +      Allow variable override of, rather than by, silent variables.
 +      When overriding variables, check the VAR_SILENT status of the
 +      old condition, not the new one: we allow non-silent overrides
 +      of silent variables (these do not hit ordering bugs in the
 +      automake output), but there is no use case for doing so the
 +      other way round.  Fixes conditional overrides of variables
 +      annotated AM_SUBST_NOTMAKE in configure.ac.
 +      * lib/Automake/Variable.pm (_check_ambiguous_condition): Check
 +      for VAR_SILENT in $ambig_cond not $cond.
 +      * tests/cond44.test, tests/cond45.test: New tests, analogous to
 +      cond23.test and cond24.test.
 +      * tests/Makefile.am: Update.
 +      Spotted originally in binutils/bfd.
 +
 +      Fix `make clean check' for the Automake package.
 +      * lib/Automake/Makefile.am (SUBDIRS): Add `.' before `tests',
 +      so that Config.pm is built first.
 +
 +      Fix in-tree `recheck' after failed test that runs `check'.
 +      If a test like pr401b-p.test fails for some reason, a `make
 +      recheck' would cause another reason for failure because it sets
 +      AM_MAKEFLAGS which gets propagated into the test and causes its
 +      `make check' to fail.
 +      * tests/defs.in: Also unset AM_MAKEFLAGS.
 +
 +2009-10-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Updated code enabling Bourne-compatibility in test scripts.
 +      * tests/defs.in: updated the code enabling Bourne-compatibility
 +      mode in the shell (now it's copied from autoconf 2.64).
 +
 +      Avoid leaking TEST_LOG_COMPILER in environment of test scripts.
 +      * tests/defs.in: Unset variable `TEST_LOG_COMPILER'.
 +
 +2009-10-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Testsuite: do not use `chmod -R' when cleaning up.
 +      * tests/Makefile.am (clean-local-check): Do not use `chmod -R' on
 +      the test directories, 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 (which is also employed in tests/defs.in).
 +
 +2009-10-06  Bruno Haible  <bruno@clisp.org>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix 'compile' script to not call mv when target equals source.
 +      * lib/compile: Don't attempt to move the generated file to its
 +      target destination when it is already at the target destination.
 +      Avoids an mv failure with subdir-objects.
 +      * tests/ccnoco3.test: New test.
 +      * tests/Makefile.am: Adjust.
 +
 +2009-10-01  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
 +
 +      Fix recommended way to run automake's test scripts with Zsh.
 +      * tests/README (Supported shells): Changed the recommended way
 +      to run automake's test scripts with Zsh.  Now we tell to use
 +      the Zsh's command line option `-o no_function_argzero', not
 +      `--no-function-argzero', since the latter does not work with
 +      versions 3.x of Zsh.
 +
  2009-09-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fixups and tests for cscope functionality.