From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 19 Apr 2009 10:48:19 +0000 (+0200)
Subject: Adjust channel definitions for new Automake `ordered' flag.
X-Git-Tag: v2.64~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737b9ddc1bf6e8432996bcf11e8fc0ff1a733610;p=thirdparty%2Fautoconf.git

Adjust channel definitions for new Automake `ordered' flag.

* lib/Autom4te/ChannelDefs.pm (Autom4te::ChannelDefs): Set
`ordered' flag to zero for channels `fatal', `automake', and
`verb'.  This has currently no effect on actual semantics but
avoids a consistency check needed for Automake's usage of the
Channels.pm code.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 055a30dd5..8829cd187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-04-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Adjust channel definitions for new Automake `ordered' flag.
+	* lib/Autom4te/ChannelDefs.pm (Autom4te::ChannelDefs): Set
+	`ordered' flag to zero for channels `fatal', `automake', and
+	`verb'.  This has currently no effect on actual semantics but
+	avoids a consistency check needed for Automake's usage of the
+	Channels.pm code.
+
 	manual: clarify m4_if synopsis.
 	* doc/autoconf.texi (Redefined M4 Macros): Rewrite synopsis of
 	m4_if in the presence of more than three arguments.
diff --git a/lib/Autom4te/ChannelDefs.pm b/lib/Autom4te/ChannelDefs.pm
index fda7264cd..86520e520 100644
--- a/lib/Autom4te/ChannelDefs.pm
+++ b/lib/Autom4te/ChannelDefs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 2008, 2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -135,7 +135,7 @@ Informative messages.
 # Do not forget to update &usage and the manual
 # if you add or change a warning channel.
 
-register_channel 'fatal', type => 'fatal';
+register_channel 'fatal', type => 'fatal', ordered => 0;
 register_channel 'error', type => 'error';
 register_channel 'error-gnu', type => 'error';
 register_channel 'error-gnu/warn', type => 'error';
@@ -144,7 +144,8 @@ register_channel 'automake', type => 'fatal', backtrace => 1,
   header => ("####################\n" .
 	     "## Internal Error ##\n" .
 	     "####################\n"),
-  footer => "\nPlease contact <bug-automake\@gnu.org>.";
+  footer => "\nPlease contact <bug-automake\@gnu.org>.",
+  ordered => 0;
 
 register_channel 'cross', type => 'warning', silent => 1;
 register_channel 'gnu', type => 'warning';
@@ -154,7 +155,7 @@ register_channel 'portability', type => 'warning', silent => 1;
 register_channel 'syntax', type => 'warning';
 register_channel 'unsupported', type => 'warning';
 
-register_channel 'verb', type => 'debug', silent => 1;
+register_channel 'verb', type => 'debug', silent => 1, ordered => 0;
 register_channel 'note', type => 'debug', silent => 0;
 
 =head2 FUNCTIONS