From: Pavel Roskin <proski@gnu.org>
Date: Fri, 6 Oct 2000 22:49:14 +0000 (+0000)
Subject: * aclocal.in (add_file): Strip comments while scanning for
X-Git-Tag: Release-1-4b~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f42c05c46d3e0831ec34c5e60946f036895d5380;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index 24d5cbe54..ddcb7faf7 100644
--- 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 2d5cce1c5..5fc838a58 100644
--- 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.