Support AC_REQUIRE_AUX_FILE, and fix requirement of AM_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.

14 files changed, 32 insertions, 16 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b91e96bc8..8616c3587 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,6 +66,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 FGREP = @FGREP@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
index 36d40705b..a67e77545 100755
--- a/tests/acsubst2.test
+++ b/tests/acsubst2.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_SUBST([FOOBAR_CFLAGS],[blablabla])
 END
 
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 88b8e7fd9..3284c05a7 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -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
diff --git a/tests/distcom6.test b/tests/distcom6.test
index 88c3e8666..28266c6c3 100755
--- a/tests/distcom6.test
+++ b/tests/distcom6.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_CONFIG_FILES([subdir/Makefile])
 AC_OUTPUT
 END
diff --git a/tests/specflg.test b/tests/specflg.test
index 069d67ee6..fbb2df41a 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 END
 
 cat > Makefile.am << 'END'
diff --git a/tests/specflg2.test b/tests/specflg2.test
index d1c2000c8..deab08439 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_RANLIB
 END
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 271d41599..51dce65cf 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -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 @@ cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(test, 0.1)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 
diff --git a/tests/specflg6.test b/tests/specflg6.test
index 19fa78503..bdbe2ae5b 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -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
 
diff --git a/tests/specflg7.test b/tests/specflg7.test
index e266c0d53..b48c66d26 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 5874b7a73..076197228 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
diff --git a/tests/specflg9.test b/tests/specflg9.test
index 29e6387b1..40dd7fedf 100755
--- a/tests/specflg9.test
+++ b/tests/specflg9.test
@@ -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 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
diff --git a/tests/subobj7.test b/tests/subobj7.test
index 3e2288a6d..729b60eb1 100755
--- a/tests/subobj7.test
+++ b/tests/subobj7.test
@@ -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 @@ bin_PROGRAMS = wish
 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
+
+:
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index 3c8b73db1..7a105f26c 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -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 @@ cat > configure.in << 'END'
 AC_INIT(foo.c)
 AM_INIT_AUTOMAKE(target-cflags,0.0)
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_OUTPUT(Makefile)
 END
 
diff --git a/tests/yacc6.test b/tests/yacc6.test
index 41bcb0c29..081e53268 100755
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -34,6 +34,7 @@ AC_CONFIG_AUX_DIR([aux1])
 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