From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 17 Mar 2011 22:31:48 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d2a076684b303de8f7ad14506e23d251ce3e5d0;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

5d2a076684b303de8f7ad14506e23d251ce3e5d0
diff --cc ChangeLog
index f2955580d,804fae6f7..a5945257d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,16 +1,40 @@@
+ 2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests: fix bug in alloca*.test
+ 	* tests/alloca.test: Make grepping of automake stderr stricter,
+ 	add a trailing `:' command; also, add AC_PROG_CC to configure.in,
+ 	and create a dummy alloca.c file, to ensure that we fail for the
+ 	proper reason.
+ 	* tests/alloca2.test: Likewise.  Also, look for LT_INIT, not
+ 	AC_PROG_LIBTOOL, in the error message (bug introduced with commit
+ 	v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
+ 	primary is used").
+ 	From a report by Patrick Welche.
+ 
 +2011-03-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	cosmetics: better use of m4 quoting and m4sugar macros
 +	* m4/dmalloc.m4: Better use of m4 quoting.  Bump serial number.
 +	* m4/gcj.m4: Likewise.
 +	* m4/init.m4: Likewise.
 +	* m4/install-sh.m4: Likewise.
 +	* m4/lex.m4: Likewise.
 +	* m4/multi.m4: Likewise.
 +	* m4/option.m4: Likewise.
 +	* m4/python.m4: Likewise.
 +	* m4/sanity.m4: Likewise.
 +	* m4/cond.m4: Likewise.  Also, prefer the m4sugar macro 'm4_if'
 +	over the plain m4 macro 'ifelse'.
 +	* m4/depend.m4: Likewise.
 +
 +2011-03-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: add test about deprecated use of AC_INIT
 +	* tests/deprecated-acinit.test: New test, check that automake
 +	and autoconf complain about an old-style AC_INIT call used with
 +	a new-style AM_AUTOMAKE_INIT call.
 +	* tests/Makefile.am (TESTS): Update.
 +
  2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
diff --cc tests/alloca.test
index bbf452f39,8a1e06e37..cff66413a
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@@ -18,6 -18,12 +18,10 @@@
  
  . ./defs || Exit 1
  
 -set -e
 -
+ cat >> configure.in <<'END'
+ AC_PROG_CC
+ END
+ 
  cat > Makefile.am << 'END'
  noinst_LIBRARIES = libtu.a
  libtu_a_SOURCES =
diff --cc tests/alloca2.test
index 9976f3f09,caf11a34d..8ebdcd705
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@@ -18,6 -18,12 +18,10 @@@
  
  . ./defs || Exit 1
  
 -set -e
 -
+ cat >> configure.in <<'END'
+ AC_PROG_CC
+ END
+ 
  cat > Makefile.am << 'END'
  noinst_LTLIBRARIES = libtu.la
  libtu_la_SOURCES =