[patch 1/2] support AC_SUBST'able automake rules

[Lars J. Aas]

First a simple organize/cleanup patch.

2001-02-01  Lars J. Aas  <address@hidden>

        * automake.in: Collect the canonical character ranges in variable
        $CANONICALS and utilize it.

--- automake.in Mon Jan 29 21:17:31 2001
+++ automake.in Wed Jan 31 03:51:41 2001
@@ -54,6 +54,7 @@
 $PATH_PATTERN='(\\w|[/.-])+';
 # This will pass through anything not of the prescribed form.
 $INCLUDE_PATTERN = "^include[ 
\t]+((\\\$\\\(top_srcdir\\\)/${PATH_PATTERN})|(\\\$\\\(srcdir\\\)/${PATH_PATTERN})|([^/\\\$]${PATH_PATTERN}))[
 \t]*(#.*)?\$";
+$CANONICALS = "A-Za-z0-9_";
 
 # Some regular expressions.  One reason to put them here is that it
 # makes indentation work better in Emacs.
@@ -1708,7 +1709,7 @@
     local ($name, @suffixes) = @_;
     local ($xname, $xt);
 
-    ($xname = $name) =~ tr/A-Za-z0-9_/_/c;
+    ($xname = $name) =~ s/[^$CANONICALS]/_/og;
     if ($xname ne $name)
     {
        local ($xt);
@@ -1842,7 +1843,7 @@
        foreach $one_file (@proglist)
        {
            # Canonicalize names.
-           ($xname = $one_file) =~ tr/A-Za-z0-9_/_/c;
+           ($xname = $one_file) =~ s/[^$CANONICALS]/_/og;
 
            if (&variable_defined ($xname . '_LDADD'))
            {
@@ -1948,7 +1949,7 @@
        foreach $onelib (@liblist)
        {
            # Canonicalize names.
-           ($xlib = $onelib) =~ tr/A-Za-z0-9_/_/c;
+           ($xlib = $onelib) =~ s/[^$CANONICALS]/_/og;
            if (&variable_defined ($xlib . '_LIBADD'))
            {
                &check_libobjs_sources ($xlib, $xlib . '_LIBADD');
@@ -2111,7 +2112,7 @@
        foreach $onelib (@liblist)
        {
            # Canonicalize names.
-           ($xlib = $onelib) =~ tr/A-Za-z0-9_/_/c;
+           ($xlib = $onelib) =~ s/[^$CANONICALS]/_/og;
            if (&variable_defined ($xlib . '_LIBADD'))
            {
                &check_libobjs_sources ($xlib, $xlib . '_LIBADD');
@@ -2316,7 +2317,7 @@
        push (@texi_deps, '$(srcdir)/' . $vtexi) if $vtexi;
 
        # Canonicalize name first.
-       ($canonical = $infobase) =~ tr/A-Za-z0-9_/_/c;
+       ($canonical = $infobase) =~ s/[^$CANONICALS]/_/og;
        if (&variable_defined ($canonical . "_TEXINFOS"))
        {
            push (@texi_deps, '$(' . $canonical . '_TEXINFOS)');