* 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 4c67d8235b73958369b60280f8d49250de70dd0f..5bd5ab61df63d63189401cb7668d172cdfe71214 100644 (file)
--- 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 cd6bffe609ed2813d68be229f81dbc436aa3a0dd..50eb7a5d12da44f08243dcb0302257d54db24134 100755 (executable)
--- 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 f94da122bd95802628f9c8c164a96bcf6990d306..819120697311d7385fe82cb7633667d48d1ca9e6 100644 (file)
--- 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.