automake aclocal bug

[Tim Mooney]

aclocal from automake 1.4-p4 (and almost certainly all previous versions)
has a minor but annoying bug with regard to the output of macro names it
can't find a definition for.  Specifically, if the macro name contains
a number anywhere in the name, such as

        AM_PROG_XML_I18N_TOOLS

then regexes in scan_configure and add_file only match up to the character
before the first number, and that's as much of the macro name as they
report in the error output.

Also, since active development is taking place on aclocal, I believe the
Copyright years should be updated.  I'm not expert on copyright law,
though.

The following patch attempts to address both issues.

Tim
-- 
Tim Mooney                              address@hidden
Information Technology Services         (701) 231-1076 (Voice)
Room 242-J6, IACC Building              (701) 231-8541 (Fax)
North Dakota State University, Fargo, ND 58105-5164


diff -ur automake-1.4-p4.orig/aclocal.in automake-1.4-p4/aclocal.in
--- automake-1.4-p4.orig/aclocal.in     Thu Jun  7 14:01:41 2001
+++ automake-1.4-p4/aclocal.in  Fri Jul 13 14:16:46 2001
@@ -3,7 +3,7 @@
 # @configure_input@

 # aclocal - create aclocal.m4 by scanning configure.ac
-# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -171,7 +171,7 @@
        elsif ($arglist[0] eq '--version')
        {
            print "aclocal (GNU $PACKAGE) $VERSION\n\n";
-           print "Copyright (C) 1999 Free Software Foundation, Inc.\n";
+           print "Copyright (C) 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 <address@hidden>\n";
@@ -237,7 +237,7 @@

        # Search for things we know about.  The "search" sub is
        # constructed dynamically by scan_m4_files.
-       if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
+       if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/)
        {
            # Macro not found, but AM_ prefix found.
            warn "aclocal: $configure_ac: $.: macro \`$2' not found in 
library\n";
@@ -360,7 +360,7 @@
        }

        # This function constructed dynamically.
-       if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
+       if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/)
        {
            # Macro not found, but AM_ prefix found.
            warn "aclocal: $configure_ac: $.: macro \`$2' not found in 
library\n";
@@ -423,7 +423,8 @@
        || die "aclocal: couldn't open \`$output_file' for writing: $!\n";
     print ACLOCAL "dnl $output_file generated automatically by aclocal 
$VERSION\n";
     print ACLOCAL "\
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-1998, 1999, 2000-2001 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
--- automake-1.4-p4.orig/ChangeLog      Sun Jun 10 05:32:39 2001
+++ automake-1.4-p4/ChangeLog   Fri Jul 13 14:24:30 2001
@@ -0,0 +1,6 @@
+2001-06-10  Tim Mooney  <address@hidden>
+
+       * 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.
+