FYI: display files and locations for AM_PROG_CC_C_O errors

[Alexandre Duret-Lutz]

I'm installing this on HEAD.

2004-09-10  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (lang_c_rewrite): Print files and locations
        for AM_PROG_CC_C_O errors.
        (handle_single_transform): Pass $var to &$subr so it can
        print locations.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1580
diff -u -r1.1580 automake.in
--- automake.in 7 Sep 2004 21:16:22 -0000       1.1580
+++ automake.in 10 Sep 2004 19:02:35 -0000
@@ -1577,7 +1577,7 @@
             my $subr = \&{'lang_' . $lang->name . '_rewrite'};
             my ($r, $source_extension)
                = &$subr ($directory, $base, $extension,
-                         $nonansi_obj, $have_per_exec_flags);
+                         $nonansi_obj, $have_per_exec_flags, $var);
             # Skip this entry if we were asked not to process it.
             next if $r == LANG_IGNORE;
 
@@ -5080,7 +5080,7 @@
 # Rewrite a single C source file.
 sub lang_c_rewrite
 {
-  my ($directory, $base, $ext, $nonansi_obj, $have_per_exec_flags) = @_;
+  my ($directory, $base, $ext, $nonansi_obj, $have_per_exec_flags, $var) = @_;
 
   if (option 'ansi2knr' && $base =~ /_$/)
     {
@@ -5098,9 +5098,9 @@
 
          # libtool is always able to put the object at the proper place,
          # so we do not have to require AM_PROG_CC_C_O when building .lo files.
-         err_am ("C objects in subdir but `AM_PROG_CC_C_O' "
-                 . "not in `$configure_ac'",
-                 uniq_scope => US_GLOBAL)
+         err_var ($var, "compiling `$base.c' in subdir requires "
+                  . "`AM_PROG_CC_C_O' in `$configure_ac'",
+                  uniq_scope => US_GLOBAL, uniq_part => UP_TEXT)
            unless $seen_cc_c_o || $nonansi_obj eq '.lo';
        }
 
@@ -5120,9 +5120,9 @@
       && ! option 'subdir-objects'
       && $nonansi_obj ne '.lo')
     {
-      err_am ("C objects with per-target flags but `AM_PROG_CC_C_O' "
-             . "not in `$configure_ac'",
-             uniq_scope => US_GLOBAL)
+      err_var ($var, "compiling `$base.c' with per-target flags requires "
+              . "`AM_PROG_CC_C_O' in `$configure_ac'",
+              uniq_scope => US_GLOBAL, uniq_part => UP_TEXT)
     }
 
     return $r;

-- 
Alexandre Duret-Lutz