* 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 15473f236f9ea3302e803e91cc40ac9ea9eefd19..80c1e67b59502d0e98d5f354593c8a51942dde00 100644 (file)
--- 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 21b87ad7d194f7e72f6158008ba6c8e47582567c..49f23e69ec1026669e2235ccaf2b7201aa06bd05 100755 (executable)
--- 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 a6b469f7cb89ca0403287ce2e4c59001f833a884..f7c709aa58e7794c0d2125d881b661d7108b4fa5 100755 (executable)
--- 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 3db62cb161ee0a14e419141f1ac83a8c5b60af32..4a4f9bf798406a2121ecbe2f20581491107ee5b5 100755 (executable)
--- 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