2001-01-21 Alexandre Duret-Lutz <duret_g@epita.fr>

	    Tom Tromey  <tromey@redhat.com>

	* automake.in (obsolete_rx): Match whole macro names, not
	substrings.
	aclocal.in (obsolete_rx): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6dd2b75..75d9213 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
+           Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (obsolete_rx): Match whole macro names, not
+       substrings.
+       aclocal.in (obsolete_rx): Likewise.
+
 2001-01-21  Tom Tromey  <tromey@redhat.com>
 
        * automake.texi: Changed dir category.

diff --git a/THANKS b/THANKS
index e852862..b8e0a7e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -4,6 +4,7 @@ people:
 
 Akim Demaille          demaille@inf.enst.fr
 Alex Hornby            alex@anvil.co.uk
+Alexandre Duret-Lutz   duret_g@epita.fr
 Alexander V. Lukyanov  lav@yars.free.net
 Andreas Schwab         schwab@lamothe.informatik.uni-dortmund.de
 Andrew Cagney          cagney@tpgi.com.au
@@ -89,7 +90,6 @@ Miles Bader           miles@ccs.mt.nec.co.jp
 Miodrag Vallat         miodrag@ifrance.com
 Morten Eriksen         mortene@sim.no
 Motoyuki Kasahara      m-kasahr@sra.co.jp
-Motoyuki Kasahara      m-kasahr@sra.co.jp
 Nicolas Thiery         nthiery@Icare.mines.edu
 NISHIDA Keisuke                knishida@nn.iij4u.or.jp
 Nelson H. F. Beebe     beebe@math.utah.edu

diff --git a/aclocal.in b/aclocal.in
index b40f576..5c205f3 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -104,7 +104,7 @@ $verbosity = 0;
      );
 
 # Regexp to match the above macros.
-$obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
+$obsolete_rx = '(\b' . join ('\b|\b', keys %obsolete_macros) . '\b)';
 
 # Matches a macro definition.
 $ac_defun_rx = "AC_DEFUN\\(\\[?([^],)\n]+)\\]?";

diff --git a/automake.in b/automake.in
index 7637b53..f5471d3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -310,7 +310,7 @@ $cygnus_mode = 0;
      );
 
 # Regexp to match the above macros.
-$obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
+$obsolete_rx = '(\b' . join ('\b|\b', keys %obsolete_macros) . '\b)';
 
 # This maps extensions onto language names.
 %extension_map = ();