From: Akim Demaille <akim@epita.fr>
Date: Thu, 21 Aug 2003 16:17:32 +0000 (+0000)
Subject: * bin/autoreconf.pm (Autom4te::Channels, Autom4te::ChannelDefs):
X-Git-Tag: AUTOCONF-2.57b~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7d12b98f8c1d9d923e9ce27b68a98d434c5492;p=thirdparty%2Fautoconf.git

* bin/autoreconf.pm (Autom4te::Channels, Autom4te::ChannelDefs):
Use them.
---

diff --git a/ChangeLog b/ChangeLog
index a4e9e287..4967490f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-21  Akim Demaille  <akim@epita.fr>
+
+	* bin/autoreconf.pm (Autom4te::Channels, Autom4te::ChannelDefs):
+	Use them.
+
 2003-08-21  Akim Demaille  <akim@epita.fr>
 
 	* lib/Autom4te/FileUtils.pm (&find_file): Walk the @include in
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index ed09cf2b..60c957f8 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -39,6 +39,8 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+use Autom4te::ChannelDefs;
+use Autom4te::Channels;
 use Autom4te::Configure_ac;
 use Autom4te::FileUtils;
 use Autom4te::General;
@@ -76,15 +78,7 @@ Operation modes:
   -m, --make               when applicable, re-run ./configure && make
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
 
-Warning categories include:
-  \`cross\'         cross compilation issues
-  \`obsolete\'      obsolete constructs
-  \`portability\'   portability issues
-  \`syntax\'        dubious syntactic constructs
-  \`all\'           all the warnings
-  \`no-CATEGORY\'   turn off the warnings on CATEGORY
-  \`none\'          turn off all the warnings
-  \`error\'         warnings are error
+" . Autom4te::ChannelDefs::usage . "
 
 The environment variable \`WARNINGS\' is honored.  Some subtools might
 support other warning types, using \`all' is encouraged.
@@ -127,7 +121,7 @@ my $aclocal_supports_force = 0;
 my @prepend_include;
 my @include;
 
-# List of warnings.
+# List of command line warning requests.
 my @warning;
 
 # Rerun `./configure && make'?
@@ -155,6 +149,8 @@ sub parse_args ()
   # Split the warnings as a list of elements instead of a list of
   # lists.
   @warning = map { split /,/ } @warning;
+  parse_WARNINGS;
+  parse_warnings '--warnings', @warning;
 
   # Even if the user specified a configure.ac, trim to get the
   # directory, and look for configure.ac again.  Because (i) the code
@@ -218,9 +214,10 @@ sub parse_args ()
   # --warnings;
   if (@warning)
     {
-      $autoconf   .= ' --warnings=' . join (',', @warning);
-      $autoheader .= ' --warnings=' . join (',', @warning);
-      $automake   .= ' --warnings=' . join (',', @warning)
+      my $warn = ' --warnings=' . join (',', @warning);
+      $autoconf   .= $warn;
+      $autoheader .= $warn;
+      $automake   .= $warn
 	if `$automake --help` =~ /--warnings/;
     }
 }
diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 0d085eee..98b07b1a 100644
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -48,26 +48,35 @@ report the warnings falling in CATEGORY [syntax]
 `cross'
 cross compilation issues
 .TP
+`gnu'
+GNU coding standards (default in gnu and gnits modes)
+.TP
 `obsolete'
-obsolete constructs
+obsolete features or constructions
+.TP
+`override'
+user redefinitions of Automake rules or variables
 .TP
 `portability'
 portability issues
 .TP
 `syntax'
-dubious syntactic constructs
+dubious syntactic constructs (default)
+.TP
+`unsupported'
+unsupported or incomplete features (default)
 .TP
 `all'
 all the warnings
 .TP
 `no-CATEGORY'
-turn off the warnings on CATEGORY
+turn off warnings in CATEGORY
 .TP
 `none'
 turn off all the warnings
 .TP
 `error'
-warnings are error
+treat warnings as errors
 .PP
 The environment variable `WARNINGS' is honored.  Some subtools might
 support other warning types, using `all' is encouraged.