From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 10 Aug 2012 11:27:14 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a6ebd193bc78a3c6641b62df2ff5369ec09c584;p=thirdparty%2Fautomake.git

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>
---

1a6ebd193bc78a3c6641b62df2ff5369ec09c584
diff --cc automake.in
index cd39d65db,faa2d296e..153c24602
--- a/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 = '';