* automake.in (&scan_autoconf_traces): Use eq for equality.

Anchor regexps.
Remove dead comment.
(&initialize_per_input): Don't initialize several times the same
vars.

diff --git a/ChangeLog b/ChangeLog
index 200bdc5..d5e1a56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-10-28  Akim Demaille  <akim@epita.fr>
 
+       * automake.in (&scan_autoconf_traces): Use eq for equality.
+       Anchor regexps.
+       Remove dead comment.
+       (&initialize_per_input): Don't initialize several times the same
+       vars.
+
+       
+2001-10-28  Akim Demaille  <akim@epita.fr>
+
        * automake.in (scan_one_autoconf_file): When using %generalize, be
        sure to replace only words.  AC_FUNC_OBSTACK was matching
        M4_AC_FUNC_OBSTACK.

diff --git a/automake.in b/automake.in
index 251dc9c..c152902 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -688,10 +688,6 @@ sub initialize_per_input ()
 
     @include_stack = ();
 
-    $relative_dir = '';
-
-    $am_relative_dir = '';
-
     %dist_dirs = ();
 
     @all = ();
@@ -4477,18 +4473,14 @@ sub scan_autoconf_traces ($)
        }
       elsif ($macro eq 'AC_LIBSOURCE')
        {
-         # We should actually also `close' the sources: getopt.c
-         # wants getopt.h etc.  But actually it should be done in the
-         # macro itself, i.e., we have to first fix Autoconf to extend
-         # _AC_LIBOBJ_DECL and use it the in various macros.
          $libsources{$args[1]} = $here;
        }
-      elsif ($macro =~ /A(C|M)_PROG_LIBTOOL/)
+      elsif ($macro =~ /^A(C|M)_PROG_LIBTOOL$/)
        {
          $seen_libtool = $here;
          $libtool_location = $here;
        }
-      elsif ($macro =~ /AC_PROG_LEX/)
+      elsif ($macro eq 'AC_PROG_LEX')
        {
          $seen_prog_lex = $here;
        }