* aclocal.in (add_file): Strip comments while scanning for

macro dependencies.

diff --git a/ChangeLog b/ChangeLog
index 24d5cbe54b73ffffdff629a20584d8a7f043a2c4..ddcb7faf76a71e3a6a7fd3ebefa4628c2f1d300a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-06  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * aclocal.in (add_file): Strip comments while scanning for
+       macro dependencies.
+
 2000-09-15  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (initialize_global_constants): End the

diff --git a/aclocal.in b/aclocal.in
index 2d5cce1c5d92eb1e9286e111392982b3eea8011f..5fc838a58f76ba251507ea2cd94b3bcdd6cbe8d8 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -362,7 +362,11 @@ sub add_file
            push (@rlist, $1);
        }
 
-       # This function constructed dynamically.
+       # Remove comments from current line.
+       s/\bdnl\b.*$//;
+       s/\#.*$//;
+
+       # The search function is constructed dynamically by scan_m4_files.
        if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
        {
            # Macro not found, but AM_ prefix found.