From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 5 Oct 2010 15:29:39 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d4fcff80f6cee71067be96f19cafd30c0e005f;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

98d4fcff80f6cee71067be96f19cafd30c0e005f
diff --cc ChangeLog
index 409ab8a9c,7883d5eb1..49af987b2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,38 +1,50 @@@
+ 2010-10-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Add support for newer python versions.
+ 	* m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
+ 	_AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
+ 	line and fix indentation.
+ 	* THANKS: Updated.
+ 	From a report by Thomas Klausner.
+ 
+ 	Add test for `AM_WITH_DMALLOC' macro.
+ 	* tests/dmalloc.test: New test.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
+ 	Fix nits and bugs in tests `help*.test'.
+ 	* tests/help4.test: Fix broken sed commands used to strip `-W...'
+ 	flags away from "$AUTOMAKE" and "$ACLOCAL".
+ 	* tests/help3.test: Likewise, and fix a botched comment.
+ 	* tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
+ 	instead of "$AUTOMAKE ... && Exit 1", for consistency and to
+ 	please maintainet-check.
+ 	* tests/help2.test: Likewise.
+ 
+ 2010-10-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Improve tests `help*.test' (also fixes maintcheck failures).
+ 	* tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
+ 	flags stripped away rather than hard-coded `automake-$APIVERSION',
+ 	to better honour user-overrides.  Similarly for aclocal.
+ 	* tests/help2.test: Likewise.
+ 	* tests/help3.test: Likewise.
+ 	* tests/help4.test: Likewise.
+ 
  2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +	tests: fix ar-lib.test for echo that interprets backslashes.
 +	* tests/ar-lib.test: Use printf instead of echo.  Avoid test -a.
 +	More robust quoting.
 +
 +2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	maintainer-check coverage for variables before rules.
 +	* Makefile.am (sc_ensure_testsuite_has_run): Suggest keeping
 +	around the test directories.
 +	(sc_tests_makefile_variable_order): New rule with a heuristic to
 +	catch ordering violations.
 +
  	Document and fix expansion of variables before rules.
  	* doc/automake.texi (General Operation): Document that variables
  	are expanded before rules.