2001-01-13 Steve Robbins <smr@debian.org>

	    Tom Tromey  <tromey@redhat.com>

	* aclocal.in (scan_configure): Don't recognize macro assignments
	or AC_SUBSTs.
	(add_file): Likewise.

diff --git a/ChangeLog b/ChangeLog
index df3147d471194d5b5f27c916f5647d722f673b83..ad024663899a86cdbac18df4ca942dadc970a100 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-13  Steve Robbins  <smr@debian.org>
+           Tom Tromey  <tromey@redhat.com>
+
+       * aclocal.in (scan_configure): Don't recognize macro assignments
+       or AC_SUBSTs.
+       (add_file): Likewise.
+
 2001-01-13  Kevin Ryde <user42@zip.com.au>
 
        * automake.in (handle_ltlibraries): Omit -rpath from

diff --git a/aclocal.in b/aclocal.in
index 901937db1edf05cc9e6b686c7f5850cc8f5f5865..9d1a4dc4009b1eeffde95042bc369cb8c23972f6 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -239,8 +239,10 @@ sub scan_configure
        }
 
        # Search for things we know about.  The "search" sub is
-       # constructed dynamically by scan_m4_files.
-       if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
+       # constructed dynamically by scan_m4_files.  The last
+       # parenthethical match makes sure we don't match things that
+       # look like macro assignments or AC_SUBSTs.
+       if (! &search && /(^|\s+)(AM_[A-Z_]+)($|[^\]\)=A-Z_])/)
        {
            # Macro not found, but AM_ prefix found.
            warn "aclocal: configure.in: $.: macro \`$2' not found in library\n";
@@ -366,8 +368,11 @@ sub add_file
        s/\bdnl\b.*$//;
        s/\#.*$//;
 
-       # The search function is constructed dynamically by scan_m4_files.
-       if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
+       # The search function is constructed dynamically by
+       # scan_m4_files.  The last parenthethical match makes sure we
+       # don't match things that look like macro assignments or
+       # AC_SUBSTs.
+       if (! &search && /(^|\s+)(AM_[A-Z_]+)($|[^\]\)=A-Z_])/)
        {
            # Macro not found, but AM_ prefix found.
            warn "aclocal: configure.in: $.: macro \`$2' not found in library\n";