tests: remove most uses of the AM_PROG_CC_C_O obsolete macro

Our NEWS file says its use will no longer be required in Automake
1.13, so better make sure that is actually the case.

* Several tests: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index 2428dc2a878a0b62b1ba347619e2d3d38fd15665..fc7c9ad179d536e64254e413ed07bf18a6853d3e 100755 (executable)
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -18,7 +18,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_SUBST([FOOBAR_CFLAGS],[blablabla])
 END
 

diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index cdeaae5d6f220ce0845849a9002ff9abe3b19fed..0e5b6a521411acbbf3b8ac6442dd04caa026e45c 100644 (file)
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -132,7 +132,6 @@ AC_INIT([$me], [1.0])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 $(if test $depcomp_with_libtool = yes; then
     echo AC_PROG_LIBTOOL

diff --git a/t/c-demo.sh b/t/c-demo.sh
index df2fc5540b327e2f355cc7e5eeecf2275bf86d5c..a0012e2cc807354dbeb378ce9ff97ce387e17270 100755 (executable)
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -27,7 +27,6 @@ AC_CONFIG_SRCDIR([tests/test.test])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AM_CONDITIONAL([RUN_TESTS], [test x"$run_tests" != x"no"])

diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index c6af79775d277d2d97d053ba7db7fe8758eab598..be9be375e00edcbf2645dd7be74a102a22f14780 100755 (executable)
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -22,9 +22,7 @@ required=gcc # For cc-no-c-o.
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
-# Make sure that $CC can be used after AM_PROG_CC_C_O.
-$CC -v || exit 1
+$CC --version; $CC -v; # For debugging.
 AC_OUTPUT
 END
 

diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index b8dd77c2b509205f1c474afe44f9f64f35683fc3..baf3bdfd08f9232ebae0f2dce46e6282e500f535 100755 (executable)
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -21,7 +21,6 @@ required=gcc # For cc-no-c-o.
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 $CC --version; $CC -v; # For debugging.
 AC_OUTPUT
 END

diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index b317fb5b87cb37999c14cd8b8aeff7b8396b3db1..beb02daae29e4bef0a8cd9a1d6b0c3fe30fdc276 100755 (executable)
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
@@ -25,7 +25,6 @@
 required=gcc # For cc-no-c-o.
 . test-init.sh
 
-# We deliberately do not call AM_PROG_CC_C_O here.
 cat >> configure.ac << 'END'
 AC_PROG_CC
 $CC --version; $CC -v; # For debugging.

diff --git a/t/check8.sh b/t/check8.sh
index a486147645b35f5979c2b030e398af65cc42e995..743d1bd00cedca4cfa1f9a77f95a606dcdf65f59 100755 (executable)
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -22,7 +22,6 @@ required='cc native'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/compile4.sh b/t/compile4.sh
index a06aa872950921721ab92bc4f9e4d0bbba706acc..ddabe3143a9c246b179a312cccc13c261891aef1 100755 (executable)
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -46,7 +46,6 @@ absmainobj=$cwd/main.obj
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AC_CONFIG_FILES([sub/Makefile])

diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index aa0be39636d0c4a32023f88610432504edd6a706..76aa3769416e4aff2bb5bf159d5d93891141dfac 100755 (executable)
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -24,7 +24,6 @@ required=cc
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-#x AM_PROG_CC_C_O
 AC_OUTPUT
 END
 
@@ -64,12 +63,9 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
 
 # Try again with subdir-objects option.
 
-sed 's/#x //' configure.ac >configure.tmp
-mv -f configure.tmp configure.ac
 echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
 
-$ACLOCAL
-$AUTOMAKE -a
+$AUTOMAKE
 grep include Makefile.in # For debugging.
 grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
 grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in

diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index c2a54da65692b660b8caa9c0bec555321e869029..52382f14a0b29199b986a838d0e952d5b3923d62 100755 (executable)
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -56,12 +56,9 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
 
 # Try again with subdir-objects option.
 
-sed 's/#x //' configure.ac >configure.tmp
-mv -f configure.tmp configure.ac
 echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
 
-$ACLOCAL
-$AUTOMAKE -a
+$AUTOMAKE
 grep include Makefile.in # For debugging.
 grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
 grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in

diff --git a/t/distcom2.sh b/t/distcom2.sh
index dc0cb4d29571201413aa717f40c00719a0327eb6..1f39b6679b7bca269cf6c589c4cbaf6fdb7c1e0d 100755 (executable)
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -22,7 +22,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_CONFIG_FILES([subdir/Makefile])
 AC_OUTPUT
 END
@@ -76,7 +75,7 @@ for opt in '' --no-force; do
 
   $FGREP ' $(top_srcdir)/depcomp ' subdir/dc.txt
   # The 'compile' script will be listed in the DIST_COMMON of the top-level
-  # Makefile because it's required in configure.ac (by AM_PROG_CC_C_O).
+  # Makefile because it's required in configure.ac (by AC_PROG_CC).
   $FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
 
 done

diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 32d8d409aff30a96833f7622ffd3e9c65f710eb0..726f809bc6bb7c020ff88030ba952f63d4fe0bad 100755 (executable)
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -23,7 +23,6 @@ required='cc libtoolize'
 
 cat >>configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_LIBTOOL
 AM_PATH_PYTHON

diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 2fa14e5c359e5d5be67c08408f769a4b11ebc1c5..f916a11e9379d7d8b597773173ef4aade777af69 100755 (executable)
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -23,7 +23,6 @@ required=cc
 
 cat >>configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AM_PATH_PYTHON

diff --git a/t/lex-line.sh b/t/lex-line.sh
index d4340e48849b46b51a90b223f240c5530cd3a171..9b27c0b391f681f2e4cb24b818b7445091876473 100755 (executable)
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -25,7 +25,6 @@ required='cc lex'
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_LEX
 AC_OUTPUT
 END

diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index 3282350c2eab8b57cc21ee145a42a119853fabc2..75e4f0c431e73287270643e7cd9c958c898c0f27 100755 (executable)
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -22,7 +22,6 @@ required='cc lex'
 
 cat >>configure.ac <<\END
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_LEX
 AC_OUTPUT
 END

diff --git a/t/lex5.sh b/t/lex5.sh
index 13c8239e59b596a8584b70cb15a34d511079aa2e..232f77dba986d46336a6c22545d5c673d1257d8f 100755 (executable)
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -21,7 +21,6 @@ required='cc lex'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_LEX
 AC_OUTPUT
 END

diff --git a/t/libobj19.sh b/t/libobj19.sh
index 65172fb21ffe41c414c3f0ebb68f37f07c6e67c7..1a4cf23d4cdc32cb1262e2e8caedf60e6a518a98 100755 (executable)
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -22,7 +22,6 @@ required=cc
 cat >> configure.ac << 'END'
 AC_CONFIG_LIBOBJ_DIR([libobj-dir])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AC_LIBOBJ([foobar])

diff --git a/t/libtool9.sh b/t/libtool9.sh
index 26eb5f147afbadd93bcb61debe962f30370a8fed..bb6ac87d92d973a02e9c8a33ca0a24b1e2d2f11c 100755 (executable)
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -24,7 +24,6 @@ required='cc libtoolize'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL

diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index 333242f9d87e5fe48407da85b6d1082083bf1dda..d27a2447254617f2b3828a4acb4419a07701adf0 100755 (executable)
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -26,7 +26,6 @@ AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([-Wno-extra-portability])
 AC_CONFIG_FILES([$makefiles])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_RANLIB
 AC_OUTPUT

diff --git a/t/pr224.sh b/t/pr224.sh
index 764d9fb9863b85227ab2a97bf734e600335d5564..b6bf6b9861cfaa4357ea5733db7e393b96cc6c26 100755 (executable)
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -43,7 +43,6 @@ EOF
 
 cat >>configure.ac <<'EOF'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 EOF
 

diff --git a/t/pr401.sh b/t/pr401.sh
index f3020429e4072a64233a54266c8903c20749c4d1..89094de75ad965dcf5ab393c4027c56222a79a23 100755 (executable)
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -45,7 +45,6 @@ cat >>configure.ac << 'EOF'
 ## These lines are activated for later tests
 #: AC_CONFIG_LIBOBJ_DIR([lib])
 AC_PROG_CC
-#x AM_PROG_CC_C_O
 AC_LIBOBJ([feep])
 AC_LIBSOURCE([feep.c])
 AM_PROG_AR
@@ -118,7 +117,7 @@ mv -f src/t src/Makefile.am
 ## Test using LIBOBJS from a sibling directory. ##
 ## -------------------------------------------- ##
 
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
 mv -f configure.tmp configure.ac
 
 cat >Makefile.am <<'EOF'

diff --git a/t/pr401b.sh b/t/pr401b.sh
index 3fa2ad1dbecb667b0c6dd705c8a165ceb0104add..cf7a6988532607f4b9429e90035ddbe152218416 100755 (executable)
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -45,7 +45,6 @@ cat >>configure.ac << 'EOF'
 ## These lines are activated for later tests
 #: AC_CONFIG_LIBOBJ_DIR([lib])
 AC_PROG_CC
-#x AM_PROG_CC_C_O
 AC_LIBOBJ([feep])
 AC_LIBSOURCE([feep.c])
 AM_PROG_AR
@@ -118,7 +117,7 @@ mv -f src/t src/Makefile.am
 ## Test using LTLIBOBJS from a sibling directory. ##
 ## ---------------------------------------------- ##
 
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
 mv -f configure.tmp configure.ac
 
 cat >Makefile.am <<'EOF'

diff --git a/t/pr401c.sh b/t/pr401c.sh
index 07c755d10b0d6078b4dffb62493b1304fac13c71..22e58762990a2b8f164512baaf3b5c9315f16c3e 100755 (executable)
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -47,7 +47,6 @@ cat >>configure.ac << 'EOF'
 ## These lines are activated for later tests.
 #: AC_CONFIG_LIBOBJ_DIR([lib])
 AC_PROG_CC
-#x AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AC_FUNC_ALLOCA
@@ -120,7 +119,7 @@ mv -f src/t src/Makefile.am
 ## Test using ALLOCA from a sibling directory. ##
 ## ------------------------------------------- ##
 
-sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.tmp
+sed 's/lib\/Makefile //' configure.ac >configure.tmp
 mv -f configure.tmp configure.ac
 
 cat >Makefile.am <<'EOF'

diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index d3fe9620717e1ea374ce2c21c927c4bc004b08ce..95963c547e3ce4a1cf5644bc6ad5f9bf67f71d89 100755 (executable)
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -24,7 +24,6 @@ cat >configure.ac <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip no-dist-gzip dist-bzip2])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END

diff --git a/t/silent-c.sh b/t/silent-c.sh
index 24af8314cdce7120bea872a18e7775506d7f66b3..28f1667b6d92e2fdbe33c307f0d4c16184e84a0b 100755 (executable)
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
@@ -25,7 +25,6 @@ mkdir sub
 cat >>configure.ac <<'EOF'
 AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 EOF
 

diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 018f8a7a9831f334515853a8b29b5fc11300a3f6..320e91f1dbccd2bf88f9724b7c5f734516892c5b 100755 (executable)
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -22,7 +22,6 @@ required='cc lex'
 mkdir sub
 
 cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
 AC_PROG_LEX
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT

diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index dc9bf2acc8fe49b6e3acb165d90cf8796d76395e..0ae003719f41ace432bf230d9297eab37b464b78 100755 (executable)
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
@@ -26,7 +26,6 @@ cat >>configure.ac <<'EOF'
 AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
 AM_PROG_AR
-AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AC_OUTPUT
 EOF

diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index bffbb6a49f62e862a1c6542dc316b2f8e66c4f09..5395af6d9656d238232e782a0c02795982679c5c 100755 (executable)
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
@@ -93,7 +93,6 @@ do_and_check_verbose_build ()
 mkdir sub
 
 cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
 AC_PROG_F77
 AC_PROG_FC
 AC_PROG_LEX

diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index 7dca0569683cb65b6e06d16f9e2a089a9ba3f762..f03204d0b0c524197532117ada4295ae2d72e9b1 100755 (executable)
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -22,7 +22,6 @@
 cat >>configure.ac <<'EOF'
 AM_SILENT_RULES
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 EOF
 

diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 5017d50692cca8aab7d6f79cd59c944c1162b846..bb215189fc4cb73eec2dba9992faa81471ff6f25 100755 (executable)
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -22,7 +22,7 @@ required='cc yacc'
 mkdir sub
 
 cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
+AC_PROG_CC
 AC_PROG_YACC
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT

diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index 89ac20657fd5efb282b923560d7f46a9aebb5d3f..c1b9cd5cef41dc8f4f759963e0d11a2b4ec4da58 100755 (executable)
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -64,7 +64,6 @@ AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 AM_PROG_UPC
 AC_PROG_OBJC
-AM_PROG_CC_C_O
 END
 
 cat > Makefile.am <<'END'

diff --git a/t/specflg6.sh b/t/specflg6.sh
index bbc83343f5e35496393fbe5873bc16a88489df69..8178b344688f9c82483875bdba5218a80dddd3fe 100755 (executable)
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -22,7 +22,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_CONDITIONAL([BAR], [true])
 END
 

diff --git a/t/specflg7.sh b/t/specflg7.sh
index ee3786e2337d884ae5ab9a860fa4427ec2d3f3c8..0a40b5debcf27a18cdf520ec06dba15dff150056 100755 (executable)
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -21,7 +21,6 @@ required='cc native'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/specflg8.sh b/t/specflg8.sh
index 3bb785b916b05f54db9b2921f2b381e4648c0560..5e51053ce4411cc46c1da6b59b59b7c42d389d17 100755 (executable)
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -23,7 +23,6 @@ required='cc native'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/specflg9.sh b/t/specflg9.sh
index 0ee90f10ac50fa2ad3be903d4e51d353a2f1535c..3e0c69484ba64154809dff2bafc812efd89153eb 100755 (executable)
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -20,7 +20,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index ddcd112e95a821766417db9639e9a39d6c1fa968..053ce417797b9bb3819b3ff1364554690981d4fc 100755 (executable)
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -28,7 +28,6 @@ cat >> configure.ac << 'END'
 AM_PROG_AR
 AC_PROG_LIBTOOL
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index df97f070833e7f817b820c69169df89ad6e7d3eb..e244e3d798bd16036d0aef1ab5710d72439d184c 100755 (executable)
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -26,7 +26,6 @@ required=cc
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_CONFIG_FILES([get-objext.sh:get-objext.in])
 AC_OUTPUT
 END

diff --git a/t/subobj.sh b/t/subobj.sh
index 6e5fd9800baee48acd6daa9c985bc5e1a052b340..d16512abc7f20e61be785c2c215cb543d2265f29 100755 (executable)
--- a/t/subobj.sh
+++ b/t/subobj.sh
@@ -18,12 +18,7 @@
 
 . test-init.sh
 
-cat >> configure.ac << 'END'
-AC_PROG_CC
-dnl This should be a no-op now, but still be supported
-dnl without causing warnings.
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
 
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = subdir-objects

diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 25cbf4e21bc9f12be5161634be3b5803b2fc9ec7..2ff04b5678a87bfcb272b8c7287348c6bc36bb5e 100755 (executable)
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -31,7 +31,6 @@ required=cc
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/subobj11b.sh b/t/subobj11b.sh
index 14970a0e4aa99bb8a3d10b968603d8d4356b62eb..deaa2b68e4d1be4a9fc83c6c3c2cdc730ee73eaa 100755 (executable)
--- a/t/subobj11b.sh
+++ b/t/subobj11b.sh
@@ -28,10 +28,7 @@
 
 . test-init.sh
 
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
 
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = subdir-objects

diff --git a/t/subobj11c.sh b/t/subobj11c.sh
index a8a435b3abffa4ffb8a9a0b89113d4bca0064bed..7476e47c00b18733fcd0185394880a9424c898b0 100755 (executable)
--- a/t/subobj11c.sh
+++ b/t/subobj11c.sh
@@ -21,10 +21,7 @@
 
 . test-init.sh
 
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AM_PROG_CC_C_O
-END
+echo AC_PROG_CC >> configure.ac
 
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = subdir-objects

diff --git a/t/subobj4.sh b/t/subobj4.sh
index 45d9666abc8d1b8771bc29a593560de55e5bea37..816f50668acd849a664c6c63bb6d1568c2214f96 100755 (executable)
--- a/t/subobj4.sh
+++ b/t/subobj4.sh
@@ -21,7 +21,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_CONFIG_FILES([d1/Makefile d2/Makefile])
 AC_OUTPUT

diff --git a/t/subobj5.sh b/t/subobj5.sh
index 54823040953f334457c61d21371136a4411e26eb..48514235429be6af67aa59d926e5c19767b3c4c1 100755 (executable)
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
@@ -23,7 +23,6 @@ required=cc
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([generic/Makefile])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/subobj6.sh b/t/subobj6.sh
index 71755fdb247e74ca1e7a3f25f5be5ceedffadca9..0e7aa86b6b202894c9d2817d76ab64a7cc04c70e 100755 (executable)
--- a/t/subobj6.sh
+++ b/t/subobj6.sh
@@ -21,7 +21,7 @@ required=cc
 . test-init.sh
 
 cat >> configure.ac << 'END'
-AM_PROG_CC_C_O
+AC_PROG_CC
 AC_OUTPUT
 END
 

diff --git a/t/subobj7.sh b/t/subobj7.sh
index 2d997c77fb966e5bd1eaa5dc9a66c58ccfade7c0..5dc9ea861c9ca3d77d69a9e735eb7bdcb5fea878 100755 (executable)
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -21,7 +21,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/subobj8.sh b/t/subobj8.sh
index 51e1727d765625936835f5e77b14a595fdfaae39..dd03008bf87945e8249db06b7a0353a65cb41ca7 100755 (executable)
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
@@ -23,7 +23,6 @@ AC_INIT([$me], [1.0])
 AC_CONFIG_AUX_DIR([tools])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_CONFIG_FILES([Makefile foo/Makefile])
 AC_OUTPUT
 END

diff --git a/t/suffix-custom-subobj-and-specflg.sh b/t/suffix-custom-subobj-and-specflg.sh
index e9f35c771bb9bfad41004b3214ebf0e6ab45ac42..32356d7b3a908f7c5b29abcbca8b5ecc1ad53c09 100755 (executable)
--- a/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh
@@ -23,7 +23,6 @@ required=cc
 
 cat >>configure.ac <<EOF
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 EOF
 

diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index 3c7d72093b557dd4b965404b92644a85b9cd320f..01bcbce931545a18781b0bf8c153f2526f1a140e 100755 (executable)
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
@@ -22,7 +22,6 @@ required=cc
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_OUTPUT
 END
 

diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index f3e905434dc52d42f945d097a0d87f12516ab743..66fd2436aef7defb6b02b328a6afdbced4863f18 100755 (executable)
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -22,7 +22,6 @@ required="valac cc pkg-config libtoolize GNUmake"
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL

diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 7b7403d8c2cd8a3a39b6e1e64824c26b0841a9d1..1ac851e0b24e3c962eab8604a60e12a18ef81e69 100755 (executable)
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -21,7 +21,6 @@ required='valac cc pkg-config GNUmake'
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.3])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_OUTPUT

diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
index ca65a4f4fdfd7dd913b39c640a38184aaa5b0ea9..88d9d332adb93ebd6c9dddaafdca625a75c7c97d 100755 (executable)
--- a/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh
@@ -23,7 +23,6 @@ mkdir src
 
 cat >> 'configure.ac' << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.0])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_OUTPUT

diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
index 34613650897dd04903148e6388a1d4cfd0023ba4..add07cf336ba5f924be15ddda11d159a75979221 100755 (executable)
--- a/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh
@@ -23,7 +23,6 @@ mkdir src
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.0])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])

diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
index 5c1f4c653f1c4efccbdee792be6fe8f19702e6c7..cf7980dd20b3516fffab9f691b4eb1f835145712 100755 (executable)
--- a/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh
@@ -23,7 +23,6 @@ mkdir src
 
 cat >> 'configure.ac' << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.0])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])

diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 9def2538593a3a39e37c32b1bf968f4244b717d8..ce5ca9d73bc06006683c617cd3f28e100e6e6149 100755 (executable)
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -21,7 +21,6 @@ required='pkg-config valac cc GNUmake'
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.3])
 PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_OUTPUT

diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 7ea2528842c4fc814202df9aa5535f8bf736da8b..8b7f7ff9bf785aa9a467acf087eee5c8e956fc91 100755 (executable)
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -27,7 +27,6 @@ useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_YACC
 AC_OUTPUT
 END

diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 9f20798a2f31119abe9616e5efb5d3ac4c14703f..58a963c8c86327b2f40fcdfb35a2d8c1787d08b2 100755 (executable)
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -21,7 +21,6 @@
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_YACC
 END
 

diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index ed30c56b3239f21991e73cce53f1537ae6cebf48..9067a2d639e969b73a7e6ed84edef564bab10046 100755 (executable)
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -25,7 +25,6 @@ required='cc yacc'
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_YACC
 AC_OUTPUT
 END

diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
index 9db49217819801b36427a63ca44b3aa148d90b93..95788ec8a7e48d485d771a11e8930e6ea795647d 100755 (executable)
--- a/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh
@@ -22,7 +22,6 @@ required='cc yacc'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_YACC
 AC_OUTPUT
 END