Merge branch 'master' into ng/master

* master:
  cleanup: remove two almost-unused global variables: {am,in}_file_name
  cleanup: remove almost-unused global var 'topsrcdir'
  automake: remove an unused variable
  tests: make a test script more semantic
  tests: remove an obsolete, no-op test script
  tests: remove an obsolete test script

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc automake.in
index cd39d65dbf82f3cd0fc3bd648fa38d733251adb7,faa2d296e59e50c23c66983e8669f511ebfe93e4..153c24602664ae8bfed4f1151d6dbf38e73c7346
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -367,9 -373,10 +367,7 @@@ my $libtool_new_api = 0
  
  # Most important AC_CANONICAL_* macro seen so far.
  my $seen_canonical = 0;
- # Location of that macro.
- my $canonical_location;
  
 -# Where AM_MAINTAINER_MODE appears.
 -my $seen_maint_mode;
 -
  # Actual version we've seen.
  my $package_version = '';