* 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/ChangeLog b/ChangeLog
index 3ecb22f..200bdc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2001-10-26  Akim Demaille  <akim@epita.fr>
 
        * tests/stamph2.test: Strengthen.

diff --git a/automake.in b/automake.in
index d5fda60..251dc9c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3748,14 +3748,14 @@ sub handle_configure
            my @files;
            if (-f $out . '.top')
            {
-               push (@files, "${cn_sans_dir}.top");
+               push (@files, "$cn_sans_dir.top");
            }
            if (-f $out . '.bot')
            {
-               push (@files, "${cn_sans_dir}.bot");
+               push (@files, "$cn_sans_dir.bot");
            }
 
-           &push_dist_common (@files);
+           push_dist_common (@files);
 
            # For now, acconfig.h can only appear in the top srcdir.
            if (-f 'acconfig.h')
@@ -4600,7 +4600,7 @@ sub scan_one_autoconf_file
 
        for my $generalize (keys %generalize)
          {
-           s/$generalize/$generalize{$generalize}/g;
+           s/\b$generalize\b/$generalize{$generalize}/g;
          }
 
 
@@ -7620,6 +7620,9 @@ my @require_file_paths = ();
 # functions.
 %require_file_found = ();
 
+
+# &maybe_push_required_file ($DIR, $FILE, $FULLFILE)
+# --------------------------------------------------
 # See if we want to push this file onto dist_common.  This function
 # encodes the rules for deciding when to do so.
 sub maybe_push_required_file
@@ -7628,14 +7631,14 @@ sub maybe_push_required_file
 
     if ($dir eq $relative_dir)
     {
-       &push_dist_common ($file);
+       push_dist_common ($file);
     }
     elsif ($relative_dir eq '.' && ! &is_make_dir ($dir))
     {
        # If we are doing the topmost directory, and the file is in a
        # subdir which does not have a Makefile, then we distribute it
        # here.
-       &push_dist_common ($fullfile);
+       push_dist_common ($fullfile);
     }
 }
 
@@ -7680,7 +7683,7 @@ sub require_file_internal ($$@)
            elsif (-f $fullfile)
            {
                $found_it = 1;
-               &maybe_push_required_file ($dir, $file, $fullfile);
+               maybe_push_required_file ($dir, $file, $fullfile);
                $save_dir = $dir;
                last;
            }
@@ -7759,8 +7762,8 @@ sub require_file_internal ($$@)
                        }
                    }
 
-                   &maybe_push_required_file (dirname ($errfile),
-                                              $file, $errfile);
+                   maybe_push_required_file (dirname ($errfile),
+                                             $file, $errfile);
 
                    # Prune the path list.
                    @require_file_paths = &dirname ($errfile);