tests: remove some more uses of the AM_PROG_CC_C_O obsolete macro

This is a follow-up to 'maint' commit v1.13.1-64-g1e44f85, but for
usages that are only in the 'ng/master' branch and couldn't thus be
modified by that commit.

* t/ax/depcomp-shuffle.sh, t/cscope.tap, t/depcomp-recover.sh,
t/libtool3.sh, t/parallel-tests-suffix-prog.sh, t/subobj-c.sh,
t/subobj-libtool.sh, t/subpkg-yacc.sh, t/subpkg.sh,
t/yacc-subobj-nodep.sh: Adjust.

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

diff --git a/t/ax/depcomp-shuffle.sh b/t/ax/depcomp-shuffle.sh
index 39de3fa648a00d0b05f6c7e8d471bea5eec52c4c..7c6988241dcf2317c6c8361ce7f4aadf625673c9 100644 (file)
--- a/t/ax/depcomp-shuffle.sh
+++ b/t/ax/depcomp-shuffle.sh
@@ -68,11 +68,12 @@ else
   grep_prog_out () { ./prg && ./prg | grep "$1" || exit 1; }
 fi
 
-echo AC_PROG_CC                         >> configure.ac
-echo AM_PROG_AR                         >> configure.ac
-echo AC_PROG_RANLIB                     >> configure.ac
-test -z "$xdir" || echo AM_PROG_CC_C_O  >> configure.ac
-echo AC_OUTPUT                          >> configure.ac
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
 
 cat > Makefile.am <<END
 noinst_PROGRAMS = prg

diff --git a/t/cscope.tap b/t/cscope.tap
index 6eb8b58b1ed58a1a58e319453fe4abd63015a993..5fc455b7f9544f77def7f101c44b88edd97fe23e 100755 (executable)
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -24,8 +24,6 @@ ocwd=$(pwd) || fatal_ "getting top-level directory"
 
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([sub/Makefile])
-m4_define([AM_PROG_CC_C_O], [:])
-AM_PROG_CC_C_O
 AC_SUBST([CC],  [who-cares])
 AC_SUBST([CXX], [who-cares])
 AC_SUBST([FC],  [who-cares])

diff --git a/t/depcomp-recover.sh b/t/depcomp-recover.sh
index bae759bde0252a61e1a55b05ff48a19c7f076c6f..17f6af448520c340f6d653254b27653ffed2aa0d 100755 (executable)
--- a/t/depcomp-recover.sh
+++ b/t/depcomp-recover.sh
@@ -24,7 +24,6 @@ required=cc
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
 END

diff --git a/t/libtool3.sh b/t/libtool3.sh
index 3e0e8cea0d3d3d608210f70ef95edfb2f625dbed..423d6ab0aa0d00eaddffb255ae8c3dc3abb8401d 100755 (executable)
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -23,7 +23,6 @@ required='cc libtoolize'
 cat >> configure.ac << 'END'
 AC_PROG_CC
 AM_PROG_AR
-AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 AC_OUTPUT
 END

diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index edef42895635fe633328f1d47e7cb3fbb27b6fa3..64f103c70ddd7a2a58715505eaf6eb43e74c0854 100755 (executable)
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.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/subobj-c.sh b/t/subobj-c.sh
index 0827b53ed3a27fa166afcd22de5b0552a7318424..5d7b24a2718d04c5d5eb5e5613a0b9d93c60a82e 100755 (executable)
--- a/t/subobj-c.sh
+++ b/t/subobj-c.sh
@@ -22,7 +22,6 @@ required=cc
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_RANLIB
 AC_OUTPUT

diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh
index f0284d5681cd40ba94e34dc7d995758c4094fa19..8afad6bfbd8577481b2cea3ef036fc57ea3233ab 100755 (executable)
--- a/t/subobj-libtool.sh
+++ b/t/subobj-libtool.sh
@@ -21,7 +21,6 @@ required='cc libtoolize'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_LIBTOOL
 AC_OUTPUT

diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index e0c2c456c80830d5ded04898d8959c5eeeaed08b..c270ec70c5cde89d113728d3d8b2ac20cb444521 100755 (executable)
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -60,7 +60,6 @@ AC_PROG_RANLIB
 AC_PROG_YACC
 dnl This comes after YACC and RANLIB checks, deliberately.
 AC_PROG_CC
-AM_PROG_CC_C_O
 AM_PROG_AR
 AC_CONFIG_HEADERS([config.h:config.hin])
 AC_CONFIG_FILES([Makefile])

diff --git a/t/subpkg.sh b/t/subpkg.sh
index b52a985d1a691d3d7110d4d78333b3f7a28ff790..93da7179a912ba56b51f5e80bfc123b5f1bef4da 100755 (executable)
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -24,7 +24,6 @@ mkdir m4
 cat >m4/foo.m4 <<'EOF'
 AC_DEFUN([FOO],[
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AM_PROG_CC_C_O])
   AC_OUTPUT
 ])
 EOF

diff --git a/t/yacc-subobj-nodep.sh b/t/yacc-subobj-nodep.sh
index 76f880a2df209594ba49f910aed7910863b36232..0dc15f24bb5b6f15cfac846022bf5c89166499e2 100755 (executable)
--- a/t/yacc-subobj-nodep.sh
+++ b/t/yacc-subobj-nodep.sh
@@ -25,7 +25,6 @@ AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([no-dependencies])
 AC_CONFIG_FILES([Makefile])
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_YACC
 AC_OUTPUT
 END