From 71418d2ff16ab22607dd4261ed33cbc839cf48d0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 13 Jan 2001 19:08:43 +0000 Subject: [PATCH] 2001-01-13 Steve Robbins Tom Tromey * aclocal.in (scan_configure): Don't recognize macro assignments or AC_SUBSTs. (add_file): Likewise. --- ChangeLog | 7 +++++++ aclocal.in | 13 +++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index df3147d4..ad024663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-01-13 Steve Robbins + Tom Tromey + + * aclocal.in (scan_configure): Don't recognize macro assignments + or AC_SUBSTs. + (add_file): Likewise. + 2001-01-13 Kevin Ryde * automake.in (handle_ltlibraries): Omit -rpath from diff --git a/aclocal.in b/aclocal.in index 901937db..9d1a4dc4 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"; -- 2.43.5