From: Tom Tromey Date: Sat, 13 Jan 2001 19:08:43 +0000 (+0000) Subject: 2001-01-13 Steve Robbins X-Git-Tag: Release-1-4d~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2925b8835df5824b75fec7aac7e38d52a19882fc;p=thirdparty%2Fautomake.git 2001-01-13 Steve Robbins Tom Tromey * aclocal.in (scan_configure): Don't recognize macro assignments or AC_SUBSTs. (add_file): Likewise. --- diff --git a/ChangeLog b/ChangeLog index df3147d47..ad0246638 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 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";