From: Tom Tromey <tromey@redhat.com>
Date: Thu, 10 May 2001 05:39:13 +0000 (+0000)
Subject: 	* automake.in (read_am_file): Correctly compute $saw_bk.
X-Git-Tag: Release-1-4f~49
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fa647761555c1b4a23094cfe94ae9c4ce585fe10;p=automake.git

	* automake.in (read_am_file): Correctly compute $saw_bk.
	(scan_autoconf_files): Ensure configure_dist_common is always
	set.
	* tests/defs (AUTOMAKE): Added --Werror.
---

diff --git a/ChangeLog b/ChangeLog
index 4c67d823..5bd5ab61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-09  Tom Tromey  <tromey@redhat.com>
+
+	* automake.in (read_am_file): Correctly compute $saw_bk.
+	(scan_autoconf_files): Ensure configure_dist_common is always
+	set.
+	* tests/defs (AUTOMAKE): Added --Werror.
+
 2001-05-09  Pavel Roskin  <proski@gnu.org>
 
 	* automake.in (define_compiler_variable): Escape $(LIBTOOL) in
diff --git a/automake.in b/automake.in
index cd6bffe6..50eb7a5d 100755
--- a/automake.in
+++ b/automake.in
@@ -4715,7 +4715,7 @@ sub scan_autoconf_files
 	if $seen_pythondir;
 
     # Preserve dist_common for later.
-    $configure_dist_common = variable_value ('DIST_COMMON', 'TRUE');
+    $configure_dist_common = variable_value ('DIST_COMMON', 'TRUE') || '';
 }
 
 ################################################################
@@ -6422,6 +6422,7 @@ sub read_am_file
     my $last_var_name = '';
     my $last_var_type = '';
     my $last_var_value = '';
+    # FIXME: shouldn't use $_ in this loop; it is too big.
     while ($_)
     {
 	$_ .= "\n"
@@ -6432,6 +6433,8 @@ sub read_am_file
 	$_ =~ s/\@MAINT\@//g
 	    unless $seen_maint_mode;
 
+	my $new_saw_bk = /\\$/;
+
 	if (/$IGNORE_PATTERN/o)
 	{
 	    # Merely delete comments beginning with two hashes.
@@ -6567,7 +6570,7 @@ sub read_am_file
 	    $comment = $spacing = '';
 	}
 
-	$saw_bk = /\\$/;
+	$saw_bk = $new_saw_bk;
         $_ = $am_file->getline;
     }
 
diff --git a/tests/defs b/tests/defs
index f94da122..81912069 100644
--- a/tests/defs
+++ b/tests/defs
@@ -74,7 +74,7 @@ echo "=== Running test $0"
 if test -z "$AUTOMAKE"; then
    perllibdir=$srcdir/../lib
    export perllibdir
-   AUTOMAKE="$PERL ../../automake --amdir=$srcdir/.. --foreign"
+   AUTOMAKE="$PERL ../../automake --amdir=$srcdir/.. --foreign --Werror"
 fi
 
 # See how aclocal should be run.