From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 16 Oct 2002 18:53:43 +0000 (+0000)
Subject: * tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
X-Git-Tag: Release-1-7b~397
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=b6aab633cbd9a76157169715447fe75beeebc74d;p=automake.git

* tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
of am_cv_prog_cc_stdc.  This follows Akim's patch of 2002-10-09,
and reveals a bug in my patch of 2002-10-15.
* automake.in (handle_single_transform_list): Strip directory name
from $full_ansi if subdir-objects is not set.
---

diff --git a/ChangeLog b/ChangeLog
index 15473f23..80c1e67b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-16  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* tests/ansi6.test, tests/ansi7.test: Set ac_cv_prog_cc_stdc instead
+	of am_cv_prog_cc_stdc.  This follows Akim's patch of 2002-10-09,
+	and reveals a bug in my patch of 2002-10-15.
+	* automake.in (handle_single_transform_list): Strip directory name
+	from $full_ansi if subdir-objects is not set.
+
 	* lib/texinfo.tex: New version from Texinfo 4.2b.
 
 2002-10-15  Alexandre Duret-Lutz  <adl@gnu.org>
diff --git a/automake.in b/automake.in
index 21b87ad7..49f23e69 100755
--- a/automake.in
+++ b/automake.in
@@ -2329,7 +2329,7 @@ sub handle_single_transform_list ($$$$@)
         my $directory = $1 || '';
         my $base = $2;
         my $extension = $3;
-	my $full_ansi = $full;	# We'll add `$U' if needed.
+	my $full_ansi = $full;	# We'll insert `$U' if needed.
 
         # We must generate a rule for the object if it requires its own flags.
         my $renamed = 0;
@@ -2452,6 +2452,8 @@ sub handle_single_transform_list ($$$$@)
 		if ($lang->ansi && defined $options{'ansi2knr'})
 		  {
 		    $full_ansi =~ s/$KNOWN_EXTENSIONS_PATTERN$/\$U$&/;
+		    $full_ansi = basename $full_ansi
+		      unless defined $options{'subdir-objects'};
 		  }
 
 		my $val = ("$full_ansi $obj_sans_ext "
diff --git a/tests/ansi6.test b/tests/ansi6.test
index a6b469f7..f7c709aa 100755
--- a/tests/ansi6.test
+++ b/tests/ansi6.test
@@ -69,5 +69,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure am_cv_prog_cc_stdc=no
+# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
+grep ac_cv_prog_cc_stdc configure
+
+./configure ac_cv_prog_cc_stdc=no
 $MAKE
diff --git a/tests/ansi7.test b/tests/ansi7.test
index 3db62cb1..4a4f9bf7 100755
--- a/tests/ansi7.test
+++ b/tests/ansi7.test
@@ -70,5 +70,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure am_cv_prog_cc_stdc=no
+# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
+grep ac_cv_prog_cc_stdc configure
+
+./configure ac_cv_prog_cc_stdc=no
 $MAKE