From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 24 Oct 2001 12:02:46 +0000 (+0000)
Subject: * automake.in (handle_languages, handle_single_transform_list,
X-Git-Tag: Release-1-5b~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1e4f629ba80280dbc5038df3416d3d27834a03e;p=thirdparty%2Fautomake.git

* automake.in (handle_languages, handle_single_transform_list,
lang_c_rewrite): Use require_conf_file instead of
require_config_file to require depcomp or compile from
Makefile.am.  (This is a part of my patch of 2001-10-15 which got
mistakenly reverted.)
---

diff --git a/ChangeLog b/ChangeLog
index 187115afe..b4448de38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-24  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* automake.in (handle_languages, handle_single_transform_list,
+	lang_c_rewrite): Use require_conf_file instead of
+	require_config_file to require depcomp or compile from
+	Makefile.am.  (This is a part of my patch of 2001-10-15 which got
+	mistakenly reverted.)
+
 2001-10-24  Akim Demaille  <akim@epita.fr>
 
 	* tests/confh.test: Since 2001-10-20 Kevin Ryde, stamp-h is
diff --git a/automake.in b/automake.in
index 706fe89a9..118ecc7e9 100755
--- a/automake.in
+++ b/automake.in
@@ -1483,7 +1483,7 @@ sub handle_languages
 	    # Set location of depcomp.
 	    &define_variable ('depcomp', "\$(SHELL) $config_aux_dir/depcomp");
 
-	    &require_config_file ($FOREIGN, 'depcomp');
+	    &require_conf_file ("$am_file.am", $FOREIGN, 'depcomp');
 
 	    my @deplist = sort keys %dep_files;
 
@@ -1848,7 +1848,7 @@ sub handle_single_transform_list ($$$$@)
                 }
                 $object = $dname . '-' . $object;
 
-                &require_config_file ($FOREIGN, 'compile')
+                &require_conf_file ("$am_file.am", $FOREIGN, 'compile')
                     if $lang->name eq 'c';
 
                 &prog_error ("$lang->name flags defined without compiler")
@@ -5068,7 +5068,7 @@ sub lang_c_rewrite
 	    am_error ("C objects in subdir but `AM_PROG_CC_C_O' not in `$configure_ac'");
 	}
 
-	require_config_file ($FOREIGN, 'compile');
+	require_conf_file ("$am_file.am", $FOREIGN, 'compile');
     }
 
     $de_ansi_files{$base} = 1;