* bin/autom4te.in (handle_output): Do not forbid the empty

pattern.
* tests/tools.at (autoconf: the empty token): New test.

diff --git a/ChangeLog b/ChangeLog
index c9522f0663765fbe0e3246313136b27f06c07dce..413263ef361df309f44c5b44a7028af20fbc83b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * bin/autom4te.in (handle_output): Do not forbid the empty
+       pattern.
+       * tests/tools.at (autoconf: the empty token): New test.
+
 2006-06-20  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/m4sugar/m4sugar.m4 (m4_init): Merge the two m4_wrap

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 95a19e77cbb6f40a565047693d3de652a27a7f9d..081c6c69437ba050499ca7922621925671ecbb4d 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -572,7 +572,7 @@ sub handle_output ($$)
       foreach (split (/\W+/))
        {
          $prohibited{$_} = $.
-           if /$forbidden/o && !/$allowed/o && ! exists $prohibited{$_};
+           if !/^$/ && /$forbidden/o && !/$allowed/o && ! exists $prohibited{$_};
        }
 
       # Performed *last*: the empty quadrigraph.

diff --git a/tests/tools.at b/tests/tools.at
index 36200f6f973c28c10e59e73e8910f7372175ea8f..c082adc0801c26fdcb7e01353bdd0bbfdd032533 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -322,8 +322,23 @@ AT_CHECK_AUTOCONF
 AT_CLEANUP
 
 
+# autoconf: do not forbid the empty token
+# ---------------------------------------
+AT_SETUP([autoconf: the empty token])
+
+AT_DATA_M4SH([configure.ac],
+[[m4_pattern_allow([^foo$])
+m4_divert([0])dnl
+ line that begins with a space
+]])
+
+AT_CHECK_AUTOCONF
+
+AT_CLEANUP
+
+
 # autoconf: subdirectories
-# --------------------------------------
+# ------------------------
 AT_SETUP([autoconf: subdirectories])
 
 AT_DATA([configure.ac],