From c912d577d6365a6f5eeb1cc854defcb287678cd5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Jul 2001 05:36:23 +0000 Subject: [PATCH] 2001-06-10 Tim Mooney * aclocal.in (parse_arguments, write_aclocal): Update Copyrights. * aclocal.in (scan_configure, add_file): Handle the full macro name even if it contains numbers, such as I18N. --- ChangeLog | 6 ++++++ THANKS | 1 + aclocal.in | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd5526f..cd95e8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-10 Tim Mooney + + * aclocal.in (parse_arguments, write_aclocal): Update Copyrights. + * aclocal.in (scan_configure, add_file): Handle the full macro + name even if it contains numbers, such as I18N. + 2001-07-16 Tom Tromey * automake.texi (Dependencies): Link to dependency tracking page. diff --git a/THANKS b/THANKS index 9d97090..8bddad8 100644 --- a/THANKS +++ b/THANKS @@ -145,6 +145,7 @@ Thomas Gagne tgagne@ix.netcom.com Thomas Morgan tmorgan@pobox.com Thomas Tanner tanner@ffii.org Tim Goodwin tjg@star.le.ac.uk +Tim Mooney mooney@dogbert.cc.ndsu.NoDak.edu Tim Van Holder tim.van.holder@pandora.be Ulrich Drepper drepper@gnu.ai.mit.edu Vadim Zeitlin Vadim.zeitlin@dptmaths.ens-cachan.fr diff --git a/aclocal.in b/aclocal.in index a6febf2..97c9eef 100644 --- a/aclocal.in +++ b/aclocal.in @@ -3,7 +3,7 @@ # @configure_input@ # aclocal - create aclocal.m4 by scanning configure.ac -# Copyright 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -182,7 +182,7 @@ sub parse_arguments elsif ($arglist[0] eq '--version') { print "aclocal (GNU $PACKAGE) $VERSION\n\n"; - print "Copyright 2000 Free Software Foundation, Inc.\n"; + print "Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; print "Written by Tom Tromey \n"; @@ -257,7 +257,7 @@ sub scan_configure # 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_])/) + if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; @@ -387,7 +387,7 @@ sub add_file # 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_])/) + if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; @@ -458,7 +458,7 @@ sub write_aclocal print ACLOCAL "# $output_file generated automatically by aclocal $VERSION\n"; print ACLOCAL "\ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -- 2.7.4