diff options
58 files changed, 12 insertions, 82 deletions
diff --git a/t/acsubst2.sh b/t/acsubst2.sh index 2428dc2a8..fc7c9ad17 100755 --- 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 cdeaae5d6..0e5b6a521 100644 --- 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 df2fc5540..a0012e2cc 100755 --- 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 c6af79775..be9be375e 100755 --- 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 b8dd77c2b..baf3bdfd0 100755 --- 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 b317fb5b8..beb02daae 100755 --- 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 a48614764..743d1bd00 100755 --- 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 a06aa8729..ddabe3143 100755 --- 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 aa0be3963..76aa37694 100755 --- 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 c2a54da65..52382f14a 100755 --- 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 dc0cb4d29..1f39b6679 100755 --- 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 32d8d409a..726f809bc 100755 --- 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 2fa14e5c3..f916a11e9 100755 --- 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 d4340e488..9b27c0b39 100755 --- 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 3282350c2..75e4f0c43 100755 --- 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 @@ -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 65172fb21..1a4cf23d4 100755 --- 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 26eb5f147..bb6ac87d9 100755 --- 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 333242f9d..d27a24472 100755 --- 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 764d9fb98..b6bf6b986 100755 --- 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 f3020429e..89094de75 100755 --- 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 3fa2ad1db..cf7a69885 100755 --- 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 07c755d10..22e587629 100755 --- 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 d3fe96207..95963c547 100755 --- 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 24af8314c..28f1667b6 100755 --- 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 018f8a7a9..320e91f1d 100755 --- 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 dc9bf2acc..0ae003719 100755 --- 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 bffbb6a49..5395af6d9 100755 --- 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 7dca05696..f03204d0b 100755 --- 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 5017d5069..bb215189f 100755 --- 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 89ac20657..c1b9cd5ce 100755 --- 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 bbc83343f..8178b3446 100755 --- 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 ee3786e23..0a40b5deb 100755 --- 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 3bb785b91..5e51053ce 100755 --- 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 0ee90f10a..3e0c69484 100755 --- 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 ddcd112e9..053ce4177 100755 --- 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 df97f0708..e244e3d79 100755 --- 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 6e5fd9800..d16512abc 100755 --- 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 25cbf4e21..2ff04b567 100755 --- 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 14970a0e4..deaa2b68e 100755 --- 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 a8a435b3a..7476e47c0 100755 --- 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 45d9666ab..816f50668 100755 --- 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 548230409..485142354 100755 --- 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 71755fdb2..0e7aa86b6 100755 --- 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 2d997c77f..5dc9ea861 100755 --- 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 51e1727d7..dd03008bf 100755 --- 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 e9f35c771..32356d7b3 100755 --- 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 3c7d72093..01bcbce93 100755 --- 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 f3e905434..66fd2436a 100755 --- 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 7b7403d8c..1ac851e0b 100755 --- 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 ca65a4f4f..88d9d332a 100755 --- 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 346136508..add07cf33 100755 --- 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 5c1f4c653..cf7980dd2 100755 --- 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 9def25385..ce5ca9d73 100755 --- 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 7ea252884..8b7f7ff9b 100755 --- 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 9f20798a2..58a963c8c 100755 --- 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 ed30c56b3..9067a2d63 100755 --- 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 9db492178..95788ec8a 100755 --- 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 |