103-handle-languages-morphing-4.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&handle_languages): Don't use $comp.
        
        
Index: automake.in
--- automake.in Thu, 29 Mar 2001 02:37:46 +0200 akim (am/f/39_automake.i 1.235 
755)
+++ automake.in Thu, 29 Mar 2001 02:41:48 +0200 akim (am/f/39_automake.i 1.235 
755)
@@ -1364,16 +1364,8 @@ sub handle_languages
        # Generate the appropriate rules for this extension.  If
        # dependency tracking was requested, and this extension
        # supports it, then we don't generate the rule here.
-       my $comp = '';
-
        if ($use_dependencies && $lang->autodep ne 'no')
          {
-           # Don't generate the rule, but still generate the variables.
-           if (defined $lang->compile)
-             {
-               $comp = $lang->compile
-             }
-
            my $compile = '$(' . $pfx . 'COMPILE)';
            my $ltcompile = '$(LT' . $pfx . 'COMPILE)';
            my %transform = (%transform,
@@ -1397,8 +1389,6 @@ sub handle_languages
          }
        elsif (defined $lang->compile)
          {
-           $comp = $lang->compile;
-
            my $outarg = $lang->output_arg;
            my $ltoutarg = '';
            if ($lang->flags eq 'CFLAGS')
@@ -1467,10 +1457,12 @@ sub handle_languages
        # People linking Java code to Fortran code deserve pain.
        $needs_c ||= ! $lang->pure;
 
-       if ($comp ne '')
+       if ($lang->compile)
          {
-           &define_compiler_variable ($lang->compiler, $ltcompile, $comp);
+           &define_compiler_variable ($lang->compiler,
+                                      $ltcompile, $lang->compile);
          }
+
        # The compiler's flag must be a configure variable.
        if (defined $lang->flags)
          {
@@ -1479,8 +1471,6 @@ sub handle_languages
 
        # Call the finisher.
        $lang->finish;
-
-
       }
 
     # If the project is entirely C++ or entirely Fortran 77 (i.e., 1