Revert previous patch (the one for PR automake/379), it conflicts with PR/280.

diff --git a/ChangeLog b/ChangeLog
index d2b748bc3073ff6ebbd75cb241f20c573512427b..780dddb1937e6c4162fac4eecbc74944412c7baa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-2002-12-03  Alexandre Duret-Lutz  <adl@gnu.org>
-
-       For PR automake/379:
-       * automake.in (read_am_file): Do not complain about backslashes
-       before blank lines when the backslash is in a comment.
-       * tests/Makefile.am (TESTS): Add comment8.test.
-       * tests/comment8.test: New file.
-
 2002-12-02  Charles Wilson  <cwilson@ece.gatech.edu>
 
        * tests/gnits3.test (AM_INSTALLCHECK_STD_OPTIONS_EXEMPT):

diff --git a/automake.in b/automake.in
index 872e7b4ef8c64ccb6bf3849d0fd7a9f888618bd8..7f3efc4815abd2994eab78a0fb85b61d2533f887 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7628,7 +7628,7 @@ sub read_am_file ($$)
        elsif (/$WHITE_PATTERN/o)
        {
            err $where, "blank line following trailing backslash"
-             if $saw_bk && $prev_state != IN_COMMENT;
+             if $saw_bk;
            # Stick a single white line before the incoming macro or rule.
            $spacing = "\n";
            $blank = 1;
@@ -7691,7 +7691,7 @@ sub read_am_file ($$)
            # Stick a single white line before the incoming macro or rule.
            $spacing = "\n";
            err $where, "blank line following trailing backslash"
-             if $saw_bk && $prev_state != IN_COMMENT;
+             if $saw_bk;
        }
        elsif (/$COMMENT_PATTERN/o)
        {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70206d71dce3f685c44b87d8b0e0db90b0564eb6..afa1c802aba24daf1413d65d0f392cbc75b9384d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -70,7 +70,6 @@ comment4.test \
 comment5.test \
 comment6.test \
 comment7.test \
-comment8.test \
 compile_f_c_cxx.test \
 cond.test \
 cond2.test \

diff --git a/tests/comment8.test b/tests/comment8.test
deleted file mode 100755 (executable)
index b797831..0000000
--- a/tests/comment8.test
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with autoconf; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Test for PR/379.  Do not print `blank line following trailing backslash'
-# when the backslash is in a comment.  People find this natural to comment
-# out part of backslashed blocks this way.
-
-. ./defs || exit 1
-
-set -e
-
-echo AC_PROG_CC >> configure.in
-
-cat > Makefile.am << 'EOF'
-# foo \
-
-test_SOURCES = a.c \
-              c.c
-#              b.c \
-
-bin_PROGRAMS = test \
-              foo \
-              baz
-#              bar \
-
-EXTRA_DIST = mumble
-EOF
-
-$ACLOCAL
-$AUTOMAKE