From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 23 May 2010 12:32:39 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~422
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8479c9adb993b3ce37c8dc112e294a80f82b4f32;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

8479c9adb993b3ce37c8dc112e294a80f82b4f32
diff --cc ChangeLog
index 71b0d9bb3,5fe605a02..7601ea51b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,44 -1,31 +1,70 @@@
+ 2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix unportable sed script in maintainer-check test.
+ 	* Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
+ 	not contain semicolon after 'b' or brace commands, for NetBSD.
+ 
+ 	Wildcards are not portable to NetBSD make.
+ 	* doc/automake.texi (Wildcards): Document portability issue.
+ 	* tests/extra10.test, tests/extra11.test, tests/extra12.test:
+ 	Require GNU make.
+ 
+ 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Make test for configure.in vs. configure.ac stricter.
+ 	* tests/configure.test: Use a configure.in file that provokes
+ 	an automake error, to ensure configure.ac is preferred.
+ 
+ 	Avoid possible false negatives in dejagnu7.test.
+ 	* tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
+ 	unportable use of fgrep option `-e'.
+ 
+ 	* tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
+ 	instead of respectively `test -e FILE' and `test ! -e FILE',
+ 	since Solaris Sh doesn't grok the latter.  Do not SKIP the test
+ 	if the shell doesn't support `test -e'.
+ 
  2010-04-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +	Warning and error message formatting cleanups.
 +	* aclocal.in (parse_arguments, main): Remove trailing period or
 +	newline in error or warning messages, avoid capitalization of
 +	the first word of a message.
 +	* automake.in (check_user_variables, handle_languages)
 +	(handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
 +	(scan_autoconf_files, cond_stack_if, require_file_internal)
 +	(usage, generate_makefile, parse_arguments): Likewise.
 +	* lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
 +	* lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
 +	* lib/Automake/Options.pm (set_strictness): Likewise.
 +	* lib/Automake/Rule.pm (define): Likewise.
 +	* lib/Automake/Variable.pm (define, variables_dump): Likewise.
 +	* tests/ltinstloc.test, tests/suffix11.test: Adjust expected
 +	error message.
 +	* lib/Automake/Channels.pm (setup_channel): Reword error message
 +	to be the same as in msg.
 +
 +	Fix placing of ellipses in English text and synopses.
 +	* Makefile.am: Be sure to add a space before `...' in natural
 +	language text.
 +	* automake.in (scan_autoconf_traces): Likewise.
 +	* lib/Automake/Rule.pm (define): Likewise.
 +	* lib/Automake/Variable.pm (define): Likewise.
 +	* lib/am/dejagnu.am: Likewise.
 +	* lib/am/progs.am: Likewise.
 +	* lib/gnupload (dprint, upload): Likewise.
 +	* tests/confdeps.test: Likewise.
 +	* tests/location.test: Adjust expected output.
 +	* automake.in (usage): In synopsis, use singular for OPTION,
 +	* remove space before ellipsis.
 +	* aclocal.in (usage): Likewise.  Also, fix indentation.
 +
 +	Fix more duplicate message prefixes.
 +	* lib/Automake/XFile.pm (seek): Do not prepend $me.
 +	($me): Remove now-unused package-global.
 +	* aclocal.in (check_acinclude): Remove duplicate 'warning: '
 +	prefix.
 +
  	Fix typo in manual.
  	* doc/automake.texi (Simple Tests using parallel-tests): Add
  	missing closing parenthesis.