From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 4 Mar 2011 18:10:00 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c8d96d3c8aee3c360d860fcfdefa1ba74747055;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

1c8d96d3c8aee3c360d860fcfdefa1ba74747055
diff --cc ChangeLog
index 456b8b430,991ed0bb8..5b666d770
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,23 +1,30 @@@
+ 2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
+ 	* tests/comments-in-var-defn.test: The configure.in stub created
+ 	by default, which has the AC_INIT first argument obtained by the
+ 	test name, causes autoconf 2.62 to fail with a spurious error
+ 	message like: "configure.in:1: error: defn: undefined macro:".
+ 	Thus, to prevent this, the test is renamed to ...
+ 	* tests/comments-in-var-def.test: ... this.
+ 	* tests/Makefile.am (TESTS): Updated.
+ 
+ 2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	cosmetics: convert encoding from ISO-8859 to UTF-8
+ 	* ChangeLog.03: Convert encoding to UTF-8.
+ 	* ChangeLog.96: Likewise.
+ 	* ChangeLog.98: Likewise.
+ 	* NEWS: Likewise.
+ 	* TODO: Likewise.
+ 
 +2011-03-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: extend checks on the 'unindent' shell function
 +	* tests/self-check-unindent.test: Also check that multiple
 +	instances of 'unindent'	can run in parallel (this was not
 +	the case when that function used temporary files).
 +
  2011-03-01  Peter Rosin  <peda@lysator.liu.se>
  
  	test defs: unindent without temporary file
diff --cc tests/Makefile.am
index 8692de561,3fdb90aad..c0efdc37e
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -249,16 -169,11 +249,16 @@@ comment8.test 
  comment9.test \
  commen10.test \
  commen11.test \
- comments-in-var-defn.test \
+ comments-in-var-def.test \
  compile.test \
  compile2.test \
 +compile3.test \
 +compile4.test \
 +compile5.test \
 +compile6.test \
  compile_f90_c_cxx.test \
  compile_f_c_cxx.test \
 +cond-basic.test \
  cond.test \
  cond2.test \
  cond3.test \
diff --cc tests/Makefile.in
index 8a258793c,cd008336a..311b52402
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -511,16 -439,11 +511,16 @@@ comment8.test 
  comment9.test \
  commen10.test \
  commen11.test \
- comments-in-var-defn.test \
+ comments-in-var-def.test \
  compile.test \
  compile2.test \
 +compile3.test \
 +compile4.test \
 +compile5.test \
 +compile6.test \
  compile_f90_c_cxx.test \
  compile_f_c_cxx.test \
 +cond-basic.test \
  cond.test \
  cond2.test \
  cond3.test \