* lib/Autom4te/FileUtils.pm (&find_file): Walk the @include in

forward order.
* lib/Autom4te/ChannelDefs.pm: Doc typos.
(&parse_warnings): Accept a list of warning requests.
(&usage): Return a string, not a side effect.
(cross): New warning category.

diff --git a/ChangeLog b/ChangeLog
index ead3f53fe0e631ed6fa8e86146330d4e5687d5bb..a4e9e2873db4475047aa613cbca5c2e53e0d596a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-21  Akim Demaille  <akim@epita.fr>
+
+       * lib/Autom4te/FileUtils.pm (&find_file): Walk the @include in
+       forward order.
+       * lib/Autom4te/ChannelDefs.pm: Doc typos.
+       (&parse_warnings): Accept a list of warning requests.
+       (&usage): Return a string, not a side effect.
+       (cross): New warning category.
+
 2003-08-21  Akim Demaille  <akim@epita.fr>
 
        * lib/Autom4te/Configure_ac.pm (&find_configure_ac)

diff --git a/lib/Autom4te/ChannelDefs.pm b/lib/Autom4te/ChannelDefs.pm
index d9865716e344f41bfce57126e7dff8a530366ba6..4afc87993c3b3d041f67a5b12825d4d5b3eeed9a 100644 (file)
--- a/lib/Autom4te/ChannelDefs.pm
+++ b/lib/Autom4te/ChannelDefs.pm
@@ -27,7 +27,7 @@ Autom4te::ChannelDefs - channel definitions for Automake and helper functions
 
   use Autom4te::ChannelDefs;
 
-  Autom4te::ChannelDefs::usage ();
+  print Autom4te::ChannelDefs::usage (), "\n";
   prog_error ($MESSAGE, [%OPTIONS]);
   error ($WHERE, $MESSAGE, [%OPTIONS]);
   error ($MESSAGE);
@@ -36,7 +36,7 @@ Autom4te::ChannelDefs - channel definitions for Automake and helper functions
   verb ($MESSAGE, [%OPTIONS]);
   switch_warning ($CATEGORY);
   parse_WARNINGS ();
-  parse_warning ($OPTION, $ARGUMENT);
+  parse_warnings ($OPTION, $ARGUMENT);
   Autom4te::ChannelDefs::set_strictness ($STRICTNESS_NAME);
 
 =head1 DESCRIPTION
@@ -80,7 +80,7 @@ Errors related to GNU Standards.
 
 =item C<error-gnu/warn>
 
-Errors related to GNU Standards that should be warnings in `foreign' mode.
+Errors related to GNU Standards that should be warnings in "foreign" mode.
 
 =item C<error-gnits>
 
@@ -90,6 +90,10 @@ Errors related to GNITS Standards (silent by default).
 
 Internal errors.  Use C<&prog_error> to send messages over this channel.
 
+=item C<cross>
+
+Constructs compromising the cross-compilation of the package.
+
 =item C<gnu>
 
 Warnings related to GNU Coding Standards.
@@ -142,6 +146,7 @@ register_channel 'automake', type => 'fatal', backtrace => 1,
             "####################\n"),
   footer => "\nPlease contact <bug-automake\@gnu.org>.";
 
+register_channel 'cross', type => 'warning', silent => 1;
 register_channel 'gnu', type => 'warning';
 register_channel 'obsolete', type => 'warning', silent => 1;
 register_channel 'override', type => 'warning', silent => 1;
@@ -158,13 +163,14 @@ register_channel 'note', type => 'debug', silent => 0;
 
 =item C<usage ()>
 
-Display warning categories.
+Return the warning category descriptions.
 
 =cut
 
 sub usage ()
 {
-  print "Warning categories include:
+  return "Warning categories include:
+  `cross'         cross compilation issues
   `gnu'           GNU coding standards (default in gnu and gnits modes)
   `obsolete'      obsolete features or constructions
   `override'      user redefinitions of Automake rules or variables
@@ -174,8 +180,7 @@ sub usage ()
   `all'           all the warnings
   `no-CATEGORY'   turn off warnings in CATEGORY
   `none'          turn off all the warnings
-  `error'         treat warnings as errors
-";
+  `error'         treat warnings as errors";
 }
 
 =item C<prog_error ($MESSAGE, [%OPTIONS])>
@@ -234,7 +239,7 @@ sub verb ($;%)
 =item C<switch_warning ($CATEGORY)>
 
 If C<$CATEGORY> is C<mumble>, turn on channel C<mumble>.
-If it's C<no-mumble>, turn C<mumble> off.
+If it is C<no-mumble>, turn C<mumble> off.
 Else handle C<all> and C<none> for completeness.
 
 =cut
@@ -293,21 +298,22 @@ sub parse_WARNINGS ()
     }
 }
 
-=item C<parse_warning ($OPTION, $ARGUMENT)>
+=item C<parse_warnings ($OPTION, @ARGUMENT)>
 
 Parse the argument of C<--warning=CATEGORY> or C<-WCATEGORY>.
 
-C<$OPTIONS> is C<"--warning"> or C<"-W">, C<$ARGUMENT> is C<CATEGORY>.
+C<$OPTIONS> is C<"--warning"> or C<"-W">, C<@ARGUMENT> is a list of
+C<CATEGORY>.
 
-This is meant to be used as a argument to C<Getopt>.
+This can be used as a argument to C<Getopt>.
 
 =cut
 
-sub parse_warnings ($$)
+sub parse_warnings ($@)
 {
-  my ($opt, $categories) = @_;
+  my ($opt, @categories) = @_;
 
-  foreach my $cat (split (',', $categories))
+  foreach my $cat (map { split ',' } @categories)
     {
       msg 'unsupported', "unknown warning category `$cat'"
        if switch_warning $cat;

diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index 65cc6b7a17f15c38554f7f12701ba3a6d7f5b4d7..5c722bc34945f901dd6ff6fa1ff5173d6baa9ebd 100644 (file)
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -83,7 +83,7 @@ sub find_file ($@)
       return undef;
     }
 
-  foreach my $path (reverse @include)
+  foreach my $path (@include)
     {
       return File::Spec->canonpath (File::Spec->catfile ($path, $filename))
        if -e File::Spec->catfile ($path, $filename)