Channels duplicate messages

[Akim Demaille]

I'm installing this.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/location.test (Makefile.am): Strengthen.
        * lib/Automake/Channels.pm (_print_message): Be sure to flush
        $partial when the message is output.
        Thanks to Alexandre Duret-Lutz.

Index: lib/Automake/Channels.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Channels.pm,v
retrieving revision 1.7
diff -u -u -r1.7 Channels.pm
--- lib/Automake/Channels.pm 29 Sep 2002 14:51:25 -0000 1.7
+++ lib/Automake/Channels.pm 31 Oct 2002 11:54:39 -0000
@@ -421,6 +421,7 @@
     {
       # Prefix with any partial message send so far.
       $msg = $partial . $msg;
+      $partial = '';
     }
 
   # Check for duplicate message if requested.
Index: tests/location.test
===================================================================
RCS file: /cvs/automake/automake/tests/location.test,v
retrieving revision 1.2
diff -u -u -r1.2 location.test
--- tests/location.test 31 Oct 2002 11:42:23 -0000 1.2
+++ tests/location.test 31 Oct 2002 11:54:39 -0000
@@ -51,10 +51,28 @@
 $ACLOCAL
 $AUTOMAKE 2>stderr && exit 1
 cat stderr
-grep 'Makefile\.am:1:.*program.*libfoo\.a' stderr
-grep 'Makefile\.am:3:.*library.*libfoo\.a' stderr
-grep 'Makefile\.am:6:.*program.*ctags' stderr
-grep 'redefinition of.*libfoo\.a' stderr
-grep 'redefinition of.*ctags' stderr
-grep 'Makefile.am:12: VAR multiply defined in condition TRUE' stderr
-grep 'Makefile.am:8: ... .VAR. previously defined here' stderr
+
+# Smash the useless difference of lib file locations.
+sed 's,^.*lib/am/\([a-z]*\.am\),\1,' stderr >observed
+cat >expected <<\EOF
+Makefile.am:12: VAR multiply defined in condition TRUE ...
+Makefile.am:8: ... `VAR' previously defined here
+automake: libfoo_a_OBJECTS should not be defined
+Makefile.am:3:   while processing library `libfoo.a'
+automake: use `libfoo_a_LDADD', not `libfoo_a_LIBADD'
+Makefile.am:3:   while processing library `libfoo.a'
+library.am: deprecated feature: target `libfoo.a' overrides `libfoo.a$(EXEEXT)'
+library.am: change your target to read `libfoo.a$(EXEEXT)'
+Makefile.am:3:   while processing library `libfoo.a'
+program.am: target `libfoo.a$(EXEEXT)' was defined here
+Makefile.am:1:   while processing program `libfoo.a'
+program.am: redefinition of `libfoo.a' in condition `TRUE'...
+Makefile.am:1:   while processing program `libfoo.a'
+library.am: ... `libfoo.a' previously defined here
+Makefile.am:3:   while processing library `libfoo.a'
+tags.am: redefinition of `ctags' in condition `TRUE'...
+program.am: ... `ctags' previously defined here
+Makefile.am:6:   while processing program `ctags'
+EOF
+
+diff expected observed || exit 1