FYI: Support AC_REQUIRE_AUX_FILE, and fix requirement of AC_PROG_CC_C_O

[Alexandre Duret-Lutz]

Following 
http://lists.gnu.org/archive/html/autoconf-patches/2004-08/msg00001.html,
I'm installing this on HEAD.

Updating the 'compile' installation to use AM_PROG_CC_C_O
uncovered a bug: when per-target were used with C sources, the
'compile' file is installed but AM_PROG_CC_C_O was not required.

Note that CVS Automake now requires CVS Autoconf.

2004-08-04  Alexandre Duret-Lutz  <address@hidden>

        Support AC_REQUIRE_AUX_FILE, and fix requirement of AC_PROG_CC_C_O.
        * automake.in (%required_aux_file): New hash.
        (handle_single_transform, lang_c_rewrite): Do note explicitly
        require 'compile', this is now an internal detail of
        AM_PROG_CC_C_O.
        (scan_autoconf_traces): Trace AC_REQUIRE_AUX_FILE and fill
        %required_aux_file.
        (scan_autoconf_files): Require all %required_aux_file instead
        of explicitly requiring install-sh and missing.
        (generate_makefile): Do not require config.sub and config.guess.
        (handle_single_transform): Pass $have_per_exec_flags to
        &lang_c_rewrite.
        * configure.ac, m4/init.m4: Require Autoconf 2.59a.
        * doc/automake.texi (Optional): Document AC_REQUIRE_AUX_FILE.
        (Program and Library Variables, Options, Public macros):
        AC_PROG_CC_C_O is required when per-target flags or subdir-objects
        are used with C sources.
        * m4/minuso.m4: Require `compile' using AC_REQUIRE_AUX_FILE.
        * m4/missing.m4: Require `missing' similarly.
        * tests/acsubst2.test, tests/distcom2.test, tests/distcom6.test,
        tests/specflg.test, tests/specflg2.test, tests/specflg3.test,
        tests/specflg6.test, tests/specflg7.test, tests/specflg8.test,
        tests/specflg9.test, tests/subobj7.test, tests/target-cflags.test,
        tests/yacc6.test: Fix to use AM_PROG_CC_C_O.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.285
diff -u -r1.285 NEWS
--- NEWS        1 Aug 2004 17:31:21 -0000       1.285
+++ NEWS        3 Aug 2004 22:55:36 -0000
@@ -1,5 +1,9 @@
 New in 1.9a:
 
+  - Autoconf 2.59a is required.
+
+  - The new AC_REQUIRE_AUX_FILE Autoconf macro is supported.
+
   - The rebuild rules for distributed Yacc and Lex output will avoid
     overwriting existing files if AM_MAINTAINER_MODE and maintainer-mode
     is not enabled.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1572
diff -u -r1.1572 automake.in
--- automake.in 3 Aug 2004 20:20:05 -0000       1.1572
+++ automake.in 3 Aug 2004 22:55:40 -0000
@@ -367,6 +367,9 @@
 # TRUE if we've seen AM_PROG_CC_C_O
 my $seen_cc_c_o = 0;
 
+# Location of AC_REQUIRE_AUX_FILES calls, indexed by their argument.
+my %required_aux_file = ();
+
 # Where AM_INIT_AUTOMAKE is called;
 my $seen_init_automake = 0;
 
@@ -1538,6 +1541,17 @@
             # Found the language, so see what it says.
             &saw_extension ($extension);
 
+           # Do we have per-executable flags for this executable?
+           my $have_per_exec_flags = 0;
+           foreach my $flag (@{$lang->flags})
+             {
+               if (set_seen ("${derived}_$flag"))
+                 {
+                   $have_per_exec_flags = 1;
+                   last;
+                 }
+             }
+
             # Note: computed subr call.  The language rewrite function
             # should return one of the LANG_* constants.  It could
             # also return a list whose first value is such a constant
@@ -1547,7 +1561,7 @@
             # further.
             my $subr = \&{'lang_' . $lang->name . '_rewrite'};
             my ($r, $source_extension)
-               = &$subr ($directory, $base, $extension);
+               = &$subr ($directory, $base, $extension, $have_per_exec_flags);
             # Skip this entry if we were asked not to process it.
             next if $r == LANG_IGNORE;
 
@@ -1570,24 +1584,11 @@
            }
            $object = $base . $this_obj_ext;
 
-           # Do we have per-executable flags for this executable?
-           my $have_per_exec_flags = 0;
-           foreach my $flag (@{$lang->flags})
-             {
-               if (set_seen ("${derived}_$flag"))
-                 {
-                   $have_per_exec_flags = 1;
-                   last;
-                 }
-             }
-
             if ($have_per_exec_flags)
             {
                 # We have a per-executable flag in effect for this
                 # object.  In this case we rewrite the object's
-                # name to ensure it is unique.  We also require
-                # the `compile' program to deal with compilers
-                # where `-c -o' does not work.
+                # name to ensure it is unique.
 
                 # We choose the name `DERIVED_OBJECT' to ensure
                 # (1) uniqueness, and (2) continuity between
@@ -1608,9 +1609,6 @@
                 }
                 $object = $dname . '-' . $object;
 
-                require_conf_file ("$am_file.am", FOREIGN, 'compile')
-                    if $lang->name eq 'c';
-
                prog_error ($lang->name . " flags defined without compiler")
                  if ! defined $lang->compile;
 
@@ -3900,7 +3898,7 @@
   my $mkidpath = "$config_aux_dir/mkinstalldirs";
   if (-f $mkidpath)
     {
-      # Use require_file so that any existingscript gets updated
+      # Use require_file so that any existing script gets updated
       # by --force-missing.
       require_conf_file ($mkidpath, FOREIGN, 'mkinstalldirs');
       define_variable ('mkinstalldirs',
@@ -4655,6 +4653,7 @@
                AC_CONFIG_LINKS => 1,
                AC_INIT => 0,
                AC_LIBSOURCE => 1,
+                AC_REQUIRE_AUX_FILE => 1,
                AC_SUBST => 1,
                AM_AUTOMAKE_VERSION => 1,
                AM_CONDITIONAL => 2,
@@ -4825,6 +4824,10 @@
        {
          $seen_cc_c_o = $where;
        }
+      elsif ($macro eq 'AC_REQUIRE_AUX_FILE')
+       {
+         $required_aux_file{$args[1]} = $where;
+       }
       elsif ($macro eq 'm4_include'
             || $macro eq 'm4_sinclude'
             || $macro eq 'sinclude')
@@ -4968,7 +4971,10 @@
   # looking at a subdir Makefile.  We must set relative_dir for
   # maybe_push_required_file to work.
   $relative_dir = '.';
-  require_conf_file ($configure_ac, FOREIGN, 'install-sh', 'missing');
+  foreach my $file (keys %required_aux_file)
+    {
+      require_conf_file ($required_aux_file{$file}->get, FOREIGN, $file)
+    }
   err_am "`install.sh' is an anachronism; use `install-sh' instead"
     if -f $config_aux_dir . '/install.sh';
 
@@ -5061,7 +5067,7 @@
 # Rewrite a single C source file.
 sub lang_c_rewrite
 {
-  my ($directory, $base, $ext) = @_;
+  my ($directory, $base, $ext, $have_per_exec_flags) = @_;
 
   if (option 'ansi2knr' && $base =~ /_$/)
     {
@@ -5081,8 +5087,6 @@
              uniq_scope => US_GLOBAL)
        unless $seen_cc_c_o;
 
-      require_conf_file ("$am_file.am", FOREIGN, 'compile');
-
       # In this case we already have the directory information, so
       # don't add it again.
       $de_ansi_files{$base} = '';
@@ -5094,6 +5098,13 @@
                               : "$directory/");
     }
 
+  if (! $seen_cc_c_o && $have_per_exec_flags && ! option 'subdir-objects')
+    {
+      err_am ("C objects with per-target flags but `AM_PROG_CC_C_O' "
+             . "not in `$configure_ac'",
+             uniq_scope => US_GLOBAL)
+    }
+
     return $r;
 }
 
@@ -7124,18 +7135,6 @@
           "`INCLUDES' is the old name for `AM_CPPFLAGS' (or `*_CPPFLAGS')")
     if var ('INCLUDES');
 
-  # At the toplevel directory, we might need config.guess, config.sub.
-  # (Libtool scripts such ltconfig as ltmain.sh are checked for in
-  # handle_libtool.)
-  if ($relative_dir eq '.')
-    {
-      # AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, and AC_CANONICAL_TARGET
-      # need config.guess and config.sub.
-      require_conf_file ($canonical_location, FOREIGN,
-                        'config.guess', 'config.sub')
-       if $seen_canonical;
-    }
-
   # Must do this after reading .am file.
   define_variable ('subdir', $relative_dir, INTERNAL);
 
Index: configure.ac
===================================================================
RCS file: /cvs/automake/automake/configure.ac,v
retrieving revision 1.21
diff -u -r1.21 configure.ac
--- configure.ac        28 Jul 2004 20:51:36 -0000      1.21
+++ configure.ac        3 Aug 2004 22:55:42 -0000
@@ -18,12 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-dnl Autoconf 2.58 defines abs_top_builddir incorrectly, so we
-dnl have to require 2.58a, otherwise all our test cases will fail
-dnl (abs_top_builddir is used in tests/automake.in).  Note that
-dnl this is a requirement for the Automake package itself.
-dnl Automake users can still use Autoconf 2.58.
-AC_PREREQ(2.58a)
+dnl Require Autoconf 2.59a for AC_REQUIRE_AUX_FILE.
+AC_PREREQ(2.59a)
 AC_INIT([GNU Automake], [1.9a], address@hidden)
 
 AC_CONFIG_SRCDIR(automake.in)
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.47
diff -u -r1.47 automake.texi
--- doc/automake.texi   3 Aug 2004 20:20:06 -0000       1.47
+++ doc/automake.texi   3 Aug 2004 22:55:48 -0000
@@ -1426,6 +1426,16 @@
 Autoconf Manual}.
 @cvindex AC_PROG_LEX
 
address@hidden AC_REQUIRE_AUX_FILE
address@hidden AC_REQUIRE_AUX_FILE
address@hidden will ensure each file for which this macro is
+called exists in the aux directory, and will complain otherwise.  It
+will also automatically distribute the file.  This macro should be
+used by third-party Autoconf macros that requires some supporting
+files in the aux directory specified with @code{AC_CONFIG_AUX_DIR}
+above.  @xref{Input, , Finding @command{configure} Input, autoconf,
+The Autoconf Manual}.
+
 @item AC_SUBST
 @cvindex AC_SUBST
 The first argument is automatically defined as a variable in each
@@ -1827,7 +1837,6 @@
 @cvindex PACKAGE, prevent definition
 @cvindex VERSION, prevent definition
 
-
 @item AM_PATH_LISPDIR
 Searches for the program @code{emacs}, and, if found, sets the output
 variable @code{lispdir} to the full path to Emacs' site-lisp directory.
@@ -1850,9 +1859,10 @@
 @code{CCAS}, and will also set @code{CCASFLAGS} if required.
 
 @item AM_PROG_CC_C_O
-This is like @code{AC_PROG_CC_C_O}, but it generates its results in the
-manner required by automake.  You must use this instead of
address@hidden when you need this functionality.
+This is like @code{AC_PROG_CC_C_O}, but it generates its results in
+the manner required by automake.  You must use this instead of
address@hidden when you need this functionality, that is, when
+using per-target flags or subdir-objects with C sources.
 
 @item AM_PROG_LEX
 @cindex HP-UX 10, lex problems
@@ -3507,8 +3517,11 @@
 different name for the intermediate object files.  Ordinarily a file
 like @file{sample.c} will be compiled to produce @file{sample.o}.
 However, if the program's @samp{_CFLAGS} variable is set, then the
-object file will be named, for instance, @file{maude-sample.o}.
-(See also @ref{renamed objects}.)
+object file will be named, for instance, @file{maude-sample.o}.  (See
+also @ref{renamed objects}.)  The use of per-target compilation flags
+with C sources requires that the macro @code{AM_PROG_CC_C_O} be called
+from @file{configure.ac}.
+
 
 In compilations with per-target flags, the ordinary @samp{AM_} form of
 the flags variable is @emph{not} automatically included in the
@@ -6180,6 +6193,9 @@
 @file{subdir/file.cxx}, then the output file would be
 @file{subdir/file.o}.
 
+In order to use this option with C sources, you should add
address@hidden to @file{configure.ac}.
+
 @item @code{tar-v7}
 @itemx @code{tar-ustar}
 @itemx @code{tar-pax}
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.59
diff -u -r1.59 init.m4
--- m4/init.m4  19 Apr 2004 23:20:08 -0000      1.59
+++ m4/init.m4  3 Aug 2004 22:55:48 -0000
@@ -35,7 +35,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.59a])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
Index: m4/minuso.m4
===================================================================
RCS file: /cvs/automake/automake/m4/minuso.m4,v
retrieving revision 1.6
diff -u -r1.6 minuso.m4
--- m4/minuso.m4        2 Jun 2003 07:08:40 -0000       1.6
+++ m4/minuso.m4        3 Aug 2004 22:55:48 -0000
@@ -4,7 +4,7 @@
 # --------------
 # Like AC_PROG_CC_C_O, but changed for automake.
 
-# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 AC_DEFUN([AM_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC_C_O])dnl
 AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
Index: m4/missing.m4
===================================================================
RCS file: /cvs/automake/automake/m4/missing.m4,v
retrieving revision 1.23
diff -u -r1.23 missing.m4
--- m4/missing.m4       2 Jun 2003 07:08:40 -0000       1.23
+++ m4/missing.m4       3 Aug 2004 22:55:48 -0000
@@ -4,7 +4,7 @@
 ## Fake the existence of programs that GNU maintainers use.  ##
 ## --------------------------------------------------------- ##
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004 Free Software Foundation, 
Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
Index: tests/acsubst2.test
===================================================================
RCS file: /cvs/automake/automake/tests/acsubst2.test,v
retrieving revision 1.3
diff -u -r1.3 acsubst2.test
--- tests/acsubst2.test 14 Nov 2003 21:25:58 -0000      1.3
+++ tests/acsubst2.test 3 Aug 2004 22:55:48 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,6 +24,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_SUBST([FOOBAR_CFLAGS],[blablabla])
 END
 
Index: tests/distcom2.test
===================================================================
RCS file: /cvs/automake/automake/tests/distcom2.test,v
retrieving revision 1.2
diff -u -r1.2 distcom2.test
--- tests/distcom2.test 14 Nov 2003 21:25:58 -0000      1.2
+++ tests/distcom2.test 3 Aug 2004 22:55:48 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -25,6 +25,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_CONFIG_FILES([subdir/Makefile])
 AC_OUTPUT
 END
Index: tests/distcom6.test
===================================================================
RCS file: /cvs/automake/automake/tests/distcom6.test,v
retrieving revision 1.1
diff -u -r1.1 distcom6.test
--- tests/distcom6.test 24 Aug 2003 22:34:59 -0000      1.1
+++ tests/distcom6.test 3 Aug 2004 22:55:48 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -29,6 +29,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_CONFIG_FILES([subdir/Makefile])
 AC_OUTPUT
 END
Index: tests/specflg.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg.test,v
retrieving revision 1.2
diff -u -r1.2 specflg.test
--- tests/specflg.test  3 Jul 2003 18:58:50 -0000       1.2
+++ tests/specflg.test  3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,6 +26,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 END
 
 cat > Makefile.am << 'END'
Index: tests/specflg2.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg2.test,v
retrieving revision 1.2
diff -u -r1.2 specflg2.test
--- tests/specflg2.test 3 Jul 2003 18:58:50 -0000       1.2
+++ tests/specflg2.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,6 +26,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_RANLIB
 END
Index: tests/specflg3.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg3.test,v
retrieving revision 1.2
diff -u -r1.2 specflg3.test
--- tests/specflg3.test 14 Nov 2003 21:26:01 -0000      1.2
+++ tests/specflg3.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,6 +26,7 @@
 AC_INIT
 AM_INIT_AUTOMAKE(test, 0.1)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 
Index: tests/specflg6.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg6.test,v
retrieving revision 1.2
diff -u -r1.2 specflg6.test
--- tests/specflg6.test 14 Nov 2003 21:26:01 -0000      1.2
+++ tests/specflg6.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,6 +26,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_CONDITIONAL(BAR, true)
 END
 
Index: tests/specflg7.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg7.test,v
retrieving revision 1.2
diff -u -r1.2 specflg7.test
--- tests/specflg7.test 14 Nov 2003 21:26:01 -0000      1.2
+++ tests/specflg7.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -27,6 +27,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
Index: tests/specflg8.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg8.test,v
retrieving revision 1.2
diff -u -r1.2 specflg8.test
--- tests/specflg8.test 14 Nov 2003 21:26:01 -0000      1.2
+++ tests/specflg8.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -29,6 +29,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
Index: tests/specflg9.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflg9.test,v
retrieving revision 1.2
diff -u -r1.2 specflg9.test
--- tests/specflg9.test 14 Nov 2003 21:26:01 -0000      1.2
+++ tests/specflg9.test 3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,6 +26,7 @@
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
Index: tests/subobj7.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj7.test,v
retrieving revision 1.3
diff -u -r1.3 subobj7.test
--- tests/subobj7.test  14 Nov 2003 21:26:01 -0000      1.3
+++ tests/subobj7.test  3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -23,11 +23,13 @@
 
 . ./defs || exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(f)
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_PROG_CC_C_O
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 
@@ -36,8 +38,9 @@
 wish_SOURCES = foo.c generic/a.c
 END
 
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing
 
 grep wish_CFLAGS Makefile.in && exit 1
-exit 0
+
+:
Index: tests/target-cflags.test
===================================================================
RCS file: /cvs/automake/automake/tests/target-cflags.test,v
retrieving revision 1.13
diff -u -r1.13 target-cflags.test
--- tests/target-cflags.test    14 Nov 2003 21:26:01 -0000      1.13
+++ tests/target-cflags.test    3 Aug 2004 22:55:49 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -28,6 +28,7 @@
 AC_INIT(foo.c)
 AM_INIT_AUTOMAKE(target-cflags,0.0)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 
Index: tests/yacc6.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc6.test,v
retrieving revision 1.9
diff -u -r1.9 yacc6.test
--- tests/yacc6.test    21 May 2004 17:43:56 -0000      1.9
+++ tests/yacc6.test    3 Aug 2004 22:55:49 -0000
@@ -34,6 +34,7 @@
 AM_INIT_AUTOMAKE
 AC_CONFIG_FILES([Makefile])
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_YACC
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT

-- 
Alexandre Duret-Lutz