From aeca9a3dd423797d594ebb95ecbb791a7d46900d Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 12 Jan 2013 16:40:42 +0100 Subject: [PATCH] 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 --- t/ax/depcomp-shuffle.sh | 11 ++++++----- t/cscope.tap | 2 -- t/depcomp-recover.sh | 1 - t/libtool3.sh | 1 - t/parallel-tests-suffix-prog.sh | 1 - t/subobj-c.sh | 1 - t/subobj-libtool.sh | 1 - t/subpkg-yacc.sh | 1 - t/subpkg.sh | 1 - t/yacc-subobj-nodep.sh | 1 - 10 files changed, 6 insertions(+), 15 deletions(-) diff --git a/t/ax/depcomp-shuffle.sh b/t/ax/depcomp-shuffle.sh index 39de3fa64..7c6988241 100644 --- 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 <> 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 bae759bde..17f6af448 100755 --- 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 3e0e8cea0..423d6ab0a 100755 --- 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 edef42895..64f103c70 100755 --- 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 0827b53ed..5d7b24a27 100755 --- 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 f0284d568..8afad6bfb 100755 --- 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 e0c2c456c..c270ec70c 100755 --- 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 b52a985d1..93da7179a 100755 --- 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 76f880a2d..0dc15f24b 100755 --- 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 -- 2.47.2