summaryrefslogtreecommitdiff
path: root/aclocal.in
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2001-01-13 19:08:43 +0000
committerTom Tromey <tromey@redhat.com>2001-01-13 19:08:43 +0000
commit2925b8835df5824b75fec7aac7e38d52a19882fc (patch)
tree8f4104a02e701c311ab6945e926787f6b8783ab1 /aclocal.in
parentf15fa67ff2df0c7c147b7f61062fe6594d75be99 (diff)
downloadautomake-2925b8835df5824b75fec7aac7e38d52a19882fc.tar.gz
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.
Diffstat (limited to 'aclocal.in')
-rw-r--r--aclocal.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/aclocal.in b/aclocal.in
index 901937db1..9d1a4dc40 100644
--- 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";