Re: make check failures

[Alexandre Duret-Lutz]

 patrick> - comment6 needs gnu make
 >> 
 >> Which make are you using?  I'd rather teach Automake to warn
 >> about this construct if it's not portable.

It turns out it was easier to fix the user input rather than to
warn about it.  I'm installing the following patch on HEAD and
branch-1-6.

I think this was the last remaining failure on NetBSD, wasn't it?

2002-07-25  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (read_am_file): Escaped newlines in comments are not
        portable.  If a comment line doesn't start with a `#', add it.
        * tests/comment6.test: Ensure this is done.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1287.2.19
diff -u -r1.1287.2.19 automake.in
--- automake.in 23 Jul 2002 18:58:55 -0000      1.1287.2.19
+++ automake.in 25 Jul 2002 21:20:19 -0000
@@ -7152,6 +7152,14 @@
            }
            elsif ($prev_state == IN_COMMENT)
            {
+               # If the line doesn't start with a `#', add it.
+               # We do this because a continuated comment like
+               #   # A = foo \
+               #         bar \
+               #         baz
+               # is not portable.  BSD make doesn't honor
+               # escaped newlines in comments.
+               s/^#?/#/;
                $comment .= $spacing . $_;
            }
            else # $prev_state == IN_VAR_DEF
Index: tests/comment6.test
===================================================================
RCS file: /cvs/automake/automake/tests/comment6.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 comment6.test
--- tests/comment6.test 14 May 2002 14:13:28 -0000      1.1.2.1
+++ tests/comment6.test 25 Jul 2002 21:20:20 -0000
@@ -31,6 +31,9 @@
 ./configure
 $MAKE
 
+grep '# SOME_FILES' Makefile
+grep '# *file3' Makefile
+
 cat > Makefile.am << 'EOF'
 all-local:
        @echo Good
@@ -44,3 +47,5 @@
 $AUTOMAKE
 ./configure
 $MAKE
+grep '# SOME_FILES' Makefile
+grep '# *file3' Makefile

-- 
Alexandre Duret-Lutz