FYI: display AM_PROG_CC_C_O diagnostic only once

[Alexandre Duret-Lutz]

I'm installing this on HEAD.

2004-09-10  Alexandre Duret-Lutz  <address@hidden>

        * lib/Automake/Channels.pm (_print_message): Handle uniq_part with
        arbitrary string.
        * automake.in (lang_c_rewrite): Set uniq_part so that the
        AM_PROG_CC_C_O diagnostic is output only once for subdir objects
        and only once for objects with per-target flags.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1581
diff -u -r1.1581 automake.in
--- automake.in 10 Sep 2004 19:03:37 -0000      1.1581
+++ automake.in 10 Sep 2004 19:26:18 -0000
@@ -5100,7 +5100,8 @@
          # so we do not have to require AM_PROG_CC_C_O when building .lo files.
          err_var ($var, "compiling `$base.c' in subdir requires "
                   . "`AM_PROG_CC_C_O' in `$configure_ac'",
-                  uniq_scope => US_GLOBAL, uniq_part => UP_TEXT)
+                  uniq_scope => US_GLOBAL,
+                  uniq_part => 'AM_PROG_CC_C_O subdir')
            unless $seen_cc_c_o || $nonansi_obj eq '.lo';
        }
 
@@ -5122,7 +5123,8 @@
     {
       err_var ($var, "compiling `$base.c' with per-target flags requires "
               . "`AM_PROG_CC_C_O' in `$configure_ac'",
-              uniq_scope => US_GLOBAL, uniq_part => UP_TEXT)
+              uniq_scope => US_GLOBAL,
+              uniq_part => 'AM_PROG_CC_C_O per-target')
     }
 
     return $r;
Index: lib/Automake/Channels.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Channels.pm,v
retrieving revision 1.9
diff -u -r1.9 Channels.pm
--- lib/Automake/Channels.pm    6 Sep 2003 05:36:56 -0000       1.9
+++ lib/Automake/Channels.pm    10 Sep 2004 19:26:28 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004 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
@@ -176,6 +176,9 @@
 documentation for the C<UP_NONE>, C<UP_TEXT>, and C<UP_LOC_TEXT>
 constants above.
 
+C<uniq_part> can also be set to an arbitrary string that will be used
+instead of the message when considering duplicates.
+
 =item C<uniq_scope =E<gt> US_LOCAL>
 
 The scope of duplicate filtering.  See the documentation for the
@@ -425,21 +428,21 @@
     }
 
   # Check for duplicate message if requested.
-  if ($opts{'uniq_part'} != UP_NONE)
+  if ($opts{'uniq_part'} ne UP_NONE)
     {
       # Which part of the error should we match?
       my $to_filter;
-      if ($opts{'uniq_part'} == UP_TEXT)
+      if ($opts{'uniq_part'} eq UP_TEXT)
        {
          $to_filter = $message;
        }
-      elsif ($opts{'uniq_part'} == UP_LOC_TEXT)
+      elsif ($opts{'uniq_part'} eq UP_LOC_TEXT)
        {
          $to_filter = $msg;
        }
       else
        {
-         confess "unknown value for uniq_part: " . $opts{'uniq_part'};
+         $to_filter = $opts{'uniq_part'};
        }
 
       # Do we want local or global uniqueness?

-- 
Alexandre Duret-Lutz