* automake.in (read_am_file): Preserve backslashes preceding ##-lines.

* tests/comment9.test: New file.
* tests/Makefile.am (TESTS): Add comment9.test.
Report from Julien Sopena.

diff --git a/ChangeLog b/ChangeLog
index 421993879159d0b11d30918f56148b8ee601c5a3..8fb1062531cae92890265f4cc31a24382232689a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-01  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (read_am_file): Preserve backslashes preceding ##-lines.
+       * tests/comment9.test: New file.
+       * tests/Makefile.am (TESTS): Add comment9.test.
+       Report from Julien Sopena.
+
        Fix for PR automake/450:
        * aclocal.in (trace_used_macros): Do not explicitly trace files
        included by configure.ac.

diff --git a/THANKS b/THANKS
index a839134cbaca25747541318a300f2f4ae12453c5..81fdec487dad42a2d977e6a13cb74dd3b099cece 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -122,6 +122,7 @@ Joshua Cowan                jcowan@jcowan.reslife.okstate.edu
 js pendry              js.pendry@msdw.com
 Juergen A. Erhard      jae@laden.ilk.de
 Juergen Keil           jk@tools.de
+Julien Sopena          julien.sopena@lip6.fr
 Karl Berry             kb@cs.umb.edu
 Karl Heuer             kwzh@gnu.org
 Kelley Cook            kcook@gcc.gnu.org

diff --git a/automake.in b/automake.in
index 5dc68a10b0301965ed344d02c10203c1cef86219..b42739989e7c35a027280883e3aefdd350b8400e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6003,6 +6003,9 @@ sub read_am_file ($$)
        if (/$IGNORE_PATTERN/o)
        {
            # Merely delete comments beginning with two hashes.
+
+           # Keep any backslash from the previous line.
+           $new_saw_bk = $saw_bk;
        }
        elsif (/$WHITE_PATTERN/o)
        {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 276ab29b096ea431288bc1ee8072019ba95b4ab7..25c11ec2092190c18b800d0923b8540d3f71acd4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,6 +98,7 @@ comment5.test \
 comment6.test \
 comment7.test \
 comment8.test \
+comment9.test \
 compile.test \
 compile_f90_c_cxx.test \
 compile_f_c_cxx.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b8cb02ed71d264c694205cba5331a690e449fa61..d9224a9aa38ac58143962d8d81540b89cab01eec 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -218,6 +218,7 @@ comment5.test \
 comment6.test \
 comment7.test \
 comment8.test \
+comment9.test \
 compile.test \
 compile_f90_c_cxx.test \
 compile_f_c_cxx.test \

diff --git a/tests/comment9.test b/tests/comment9.test
new file mode 100755 (executable)
index 0000000..e150ef2
--- /dev/null
+++ b/tests/comment9.test
@@ -0,0 +1,54 @@
+#! /bin/sh
+# Copyright (C) 2005  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 Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure ##-comments are ignored in variable definitions.
+# Report from Julien Sopena.
+
+. ./defs || exit 1
+
+set -e
+
+cat > Makefile.am << 'EOF'
+TESTS = \
+   1.test \
+   2.test \
+   3.test \
+## 4.test \
+   5.test \
+   6.test \
+   7.test
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+sed -n -e '/^TESTS =.*\\$/ {
+   :loop
+   p
+   n
+   /\\$/ b loop
+   p
+   n
+   }' -e '/^TESTS =/ p' Makefile.in > tests
+
+grep '3\.test' tests
+grep '&&' tests && exit 1
+grep '4\.test' tests && exit 1
+grep '5\.test' tests