* bin/autoheader.in (&parse_args): Use &parse_warnings and

&parse_WARNINGS.
($help): Use Autom4te::ChannelDefs::usage.
* bin/autoscan.in: Use Autom4te::ChannelDefs.
* lib/Autom4te/General.pm: Don't export error: you don't own it.

diff --git a/ChangeLog b/ChangeLog
index 78cf74ee12d47945376a6fa0a9000f170eeb29ac..20bec2885f385131280cc959c36bb57bf29a31a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-21  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoheader.in (&parse_args): Use &parse_warnings and
+       &parse_WARNINGS.
+       ($help): Use Autom4te::ChannelDefs::usage.
+       * bin/autoscan.in: Use Autom4te::ChannelDefs.
+       * lib/Autom4te/General.pm: Don't export error: you don't own it.
+
 2003-08-21  Akim Demaille  <akim@epita.fr>
 
        First stab at preserving warnings between calls to autom4te,

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 9ada8ff61870a15b92ef09e0d434ad2e22e8f64b..e6872ea12a2758a303babec0e281e9534eda2659 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -56,12 +56,11 @@ local $config_h;
 my $config_h_in;
 my @prepend_include;
 my @include;
-my @warning;
 
 
 # $HELP
 # -----
-$help = <<"END";
+$help = "\
 Usage: $0 [OPTION] ... [TEMPLATE-FILE]
 
 Create a template file of C \`\#define\' statements for \`configure\' to
@@ -75,31 +74,26 @@ or else \`configure.in\'.
   -f, --force              consider all files obsolete
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY
 
-Warning categories include:
-  \`obsolete\'      obsolete 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 () . "
 
 Library directories:
   -B, --prepend-include=DIR  prepend directory DIR to search path
   -I, --include=DIR          append directory DIR to search path
 
 Report bugs to <bug-autoconf\@gnu.org>.
-END
+";
 
 
 # $VERSION
 # --------
-$version = <<"END";
+$version = "\
 autoheader (@PACKAGE_NAME@) @VERSION@
 Written by Roland McGrath and Akim Demaille.
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-END
+";
 
 
 ## ---------- ##
@@ -114,9 +108,10 @@ sub parse_args ()
 {
   my $srcdir;
 
-  getopt ('I|include=s' => \@include,
+  parse_WARNINGS;
+  getopt ('I|include=s'         => \@include,
          'B|prepend-include=s' => \@prepend_include,
-         'W|warnings=s' => \@warning);
+         'W|warnings=s'        => \&parse_warnings);
 
   setup_channel 'note', silent => !$verbose;
 

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 1d460888feca87a52326c1535cd7c15553637ebe..bea5c60a9400895efe65b1bcd8cdfee5e6e4c2e1 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -36,6 +36,7 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+use Autom4te::ChannelDefs;
 use Autom4te::Configure_ac;
 use Autom4te::General;
 use Autom4te::XFile;

diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index 518c6b897688db3d635139bce5f600e022a10e60..a5dc7bcca9e444f8878da5cc935f8249c06e0e84 100644 (file)
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -53,7 +53,7 @@ my @export_vars =
 
 # Functions we define and export.
 my @export_subs =
-  qw (&debug &error
+  qw (&debug
       &file_name_is_absolute
       &getopt &mktmpdir
       &uniq &verbose);

diff --git a/man/autoheader.1 b/man/autoheader.1
index 44afaeeb6d7bb93c2b4bcd27966892c84f78149a..7a20fb9a1be84ad098f2cc6affcc379ae096d163 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH AUTOHEADER "1" "August 2003" "autoheader 2.57b" "User Commands"
+.TH AUTOHEADER "1" "August 2003" "autoheader " "User Commands"
 .SH NAME
 autoheader \- Create a template header for configure
 .SH SYNOPSIS
@@ -29,20 +29,38 @@ consider all files obsolete
 report the warnings falling in CATEGORY
 .SS "Warning categories include:"
 .TP
+`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 (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
 .SS "Library directories:"
 .TP
 \fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
@@ -54,6 +72,8 @@ append directory DIR to search path
 Written by Roland McGrath and Akim Demaille.
 .SH "REPORTING BUGS"
 Report bugs to <bug-autoconf@gnu.org>.
+.PP
+autoheader (GNU Autoconf) 2.57b
 .SH COPYRIGHT
 Copyright \(co 2003 Free Software Foundation, Inc.
 .br