From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 23:50:34 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962acb88fb57db0e58620250c681ad51190d0c5c;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  NEWS: better distinction between obsolete and obsolescent features
  cleanup: get rid of 'Automake::Configure_ac' module
  maint: remove last vestiges of 'configure.in' support from the testsuite
  tests: remove a botched comment from a test case
  maint: reflect removal of 'configure.in' support in comments and messages
  Drop support for 'configure.in' as the Autoconf input file
  Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete

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

962acb88fb57db0e58620250c681ad51190d0c5c
diff --cc automake.in
index 7d431e947,3253f7fc9..5435be6d1
--- a/automake.in
+++ b/automake.in
@@@ -3490,12 -4000,12 +3492,12 @@@ sub handle_configure ($@
    $colon_infile = '' if $colon_infile eq ":$makefile.in";
    my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
    my $regen_aclocal_m4 = scan_aclocal_m4;
 -  define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
 -			  @configure_deps, "\$(top_srcdir)/$configure_ac");
 -  my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
 -  push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
 -  define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,
 -			  @configuredeps);
 +  define_variable ('am.remake.aclocal-m4-deps', INTERNAL,
-                    @configure_deps, '$(top_srcdir)/' . $configure_ac);
++                   @configure_deps, "\$(top_srcdir)/$configure_ac");
 +  my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
 +                       '$(CONFIGURE_DEPENDENCIES)');
 +  push @configuredeps, '$(am.remake.aclocal-m4)' if -f 'aclocal.m4';
 +  define_variable ('am.remake.configure-deps', INTERNAL, @configuredeps);
  
    my $automake_options = '--' . $strictness_name .
  			 (global_option 'no-dependencies' ? ' --ignore-deps' : '');
diff --cc syntax-checks.mk
index eaae627c8,b7fe6311b..1231d6b79
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -558,9 -438,20 +558,20 @@@ sc_m4_am_plain_egrep_fgrep
  	  exit 1; \
  	fi
  
+ ## Use 'configure.ac', not the obsolete 'configure.in', as the name
+ ## for configure input files in our testsuite.  The latter  has been
+ ## deprecated for several years (at least since autoconf 2.50) and
+ ## support for it will be removed in Automake 1.14.
+ sc_tests_no_configure_in:
+ 	@if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs); then \
+ 	  echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
+ 	  echo "for configure input files in the test cases above." >&2; \
+ 	  exit 1; \
+ 	fi
+ 
  ## Rule to ensure that the testsuite has been run before.  We don't depend
  ## on 'check' here, because that would be very wasteful in the common case.
 -## We could run "make check RECHECK_LOGS=" and avoid toplevel races with
 +## We could run "make check AM_LAZY_CHECK=yes" and avoid toplevel races with
  ## AM_RECURSIVE_TARGETS.  Suggest keeping test directories around for
  ## greppability of the Makefile.in files.
  sc_ensure_testsuite_has_run: