08-no-join.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (handle_tags): Use &transform.
        (am_error, am_line_error, am_conf_error, read_am_file): Use
        directly arrays in strings, no need for &join.
        * Makefile.am (maintainer-check): Use grep -w when looking for
        words.
        
        
Index: automake.in
--- automake.in Sat, 27 Jan 2001 02:11:54 +0100 akim (am/f/39_automake.i 1.11 
755)
+++ automake.in Sat, 27 Jan 2001 02:27:31 +0100 akim (am/f/39_automake.i 1.11 
755)
@@ -2569,21 +2569,19 @@ sub handle_tags
        || &variable_defined ('ETAGS_ARGS')
        || @tag_deps)
     {
-       local ($xform) = '';
+       local ($config) = '';
        local ($one_hdr);
        foreach $one_hdr (@config_headers)
        {
            if ($relative_dir eq &dirname ($one_hdr))
            {
                # The config header is in this directory.  So require it.
-               local ($var);
-               ($var = &basename ($one_hdr)) =~ s/(\W)/\\$1/g;
-               $xform .= ' ' if $xform;
-               $xform .= $var;
+               $config .= ' ' if $config;
+               $config .= &basename ($one_hdr);
            }
        }
-       $xform = ('s/address@hidden@/' . $xform . '/;'
-                 . 's/address@hidden@/' . join (' ', @tag_deps) . '/;');
+       local $xform = &transform ('CONFIG' => $xform,
+                                  'DIRS'   => join (' ', @tag_deps));
 
        if (&variable_defined ('SUBDIRS'))
        {
@@ -6516,7 +6514,7 @@ sub read_am_file
     {
        if (@conditional_stack)
        {
-           &am_error ("unterminated conditionals: " . join (' ', 
@conditional_stack));
+           &am_error ("unterminated conditionals: @conditional_stack");
        }
        else
        {
@@ -7824,7 +7822,7 @@ sub my_glob
 # Print an error message and set exit status.
 sub am_error
 {
-    warn "automake: ${am_file}.am: ", join (' ', @_), "\n";
+    warn "automake: ${am_file}.am: @_\n";
     $exit_status = 1;
 }
 
@@ -7857,7 +7855,7 @@ sub am_line_error
        {
            # Couldn't find the line number.
        }
-       warn $file, ": ", join (' ', @args), "\n";
+       warn $file, ": @args\n";
        $exit_status = 1;
     }
     else
@@ -7870,7 +7868,7 @@ sub am_line_error
 sub am_conf_error
 {
     # FIXME: can run in subdirs.
-    warn "automake: $configure_ac: ", join (' ', @_), "\n";
+    warn "automake: $configure_ac: @_\n";
     $exit_status = 1;
 }
 
@@ -7881,7 +7879,7 @@ sub am_conf_line_error
 
     if ($line)
     {
-       warn "$file: $line: ", join (' ', @args), "\n";
+       warn "$file: $line: @args\n";
        $exit_status = 1;
     }
     else
Index: Makefile.in
--- Makefile.in Sat, 13 Jan 2001 18:11:09 +0100 akim (am/f/45_Makefile.i 1.1 
644)
+++ Makefile.in Sat, 27 Jan 2001 02:23:26 +0100 akim (am/f/45_Makefile.i 1.1 
644)
@@ -668,7 +668,7 @@
          perl4.036 -c -w automake; \
          perl4.036 -c -w aclocal; \
        else :; fi
-       @if grep undef $(srcdir)/automake.in > /dev/null 2>&1; then \
+       @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \
        fi
Index: Makefile.am
--- Makefile.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/f/46_Makefile.a 1.1 
664)
+++ Makefile.am Sat, 27 Jan 2001 02:23:18 +0100 akim (am/f/46_Makefile.a 1.1 
664)
@@ -96,7 +96,7 @@
          perl4.036 -c -w aclocal; \
        else :; fi
 ## We never want to use "undef", only "delete".
-       @if grep undef $(srcdir)/automake.in > /dev/null 2>&1; then \
+       @if grep -w undef $(srcdir)/automake.in > /dev/null 2>&1; then \
          echo "Found undef in automake.in; use delete instead" 1>&2; \
          exit 1; \
        fi