summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/README10
-rwxr-xr-xtests/ac-output-old.tap14
-rwxr-xr-xtests/acloca10.test2
-rwxr-xr-xtests/acloca11.test2
-rwxr-xr-xtests/acloca12.test2
-rwxr-xr-xtests/acloca13.test2
-rwxr-xr-xtests/acloca14.test4
-rwxr-xr-xtests/acloca15.test4
-rwxr-xr-xtests/acloca16.test2
-rwxr-xr-xtests/acloca17.test4
-rwxr-xr-xtests/acloca18.test2
-rwxr-xr-xtests/acloca19.test2
-rwxr-xr-xtests/acloca20.test2
-rwxr-xr-xtests/acloca21.test2
-rwxr-xr-xtests/acloca22.test6
-rwxr-xr-xtests/acloca23.test2
-rwxr-xr-xtests/aclocal-acdir.test2
-rwxr-xr-xtests/aclocal-install-absdir.test2
-rwxr-xr-xtests/aclocal-path-install-serial.test2
-rwxr-xr-xtests/aclocal-path-install.test4
-rwxr-xr-xtests/aclocal-path-nonexistent.test2
-rwxr-xr-xtests/aclocal-path-precedence.test2
-rwxr-xr-xtests/aclocal-path.test2
-rwxr-xr-xtests/aclocal.test2
-rwxr-xr-xtests/aclocal3.test2
-rwxr-xr-xtests/aclocal4.test2
-rwxr-xr-xtests/aclocal5.test2
-rwxr-xr-xtests/aclocal6.test2
-rwxr-xr-xtests/aclocal7.test2
-rwxr-xr-xtests/aclocal8.test2
-rwxr-xr-xtests/aclocal9.test2
-rwxr-xr-xtests/acsilent.test2
-rwxr-xr-xtests/acsubst.test2
-rwxr-xr-xtests/acsubst2.test2
-rwxr-xr-xtests/add-missing.tap34
-rwxr-xr-xtests/alloca.test4
-rwxr-xr-xtests/alloca2.test4
-rwxr-xr-xtests/alpha.test2
-rwxr-xr-xtests/alpha2.test4
-rwxr-xr-xtests/am-tests-environment.test2
-rwxr-xr-xtests/amassign.test4
-rwxr-xr-xtests/ammissing.test4
-rwxr-xr-xtests/amopt.test2
-rwxr-xr-xtests/amopts-location.test2
-rwxr-xr-xtests/amopts-variable-expansion.test2
-rwxr-xr-xtests/amsubst.test2
-rwxr-xr-xtests/ansi2knr-no-more.test20
-rwxr-xr-xtests/ar-lib2.test4
-rwxr-xr-xtests/ar-lib3.test4
-rwxr-xr-xtests/ar-lib4.test8
-rwxr-xr-xtests/ar-lib5a.test2
-rwxr-xr-xtests/ar-lib5b.test2
-rwxr-xr-xtests/ar-lib6a.test2
-rwxr-xr-xtests/ar-lib6b.test2
-rwxr-xr-xtests/ar-lib7.test4
-rwxr-xr-xtests/ar.test4
-rwxr-xr-xtests/ar2.test2
-rwxr-xr-xtests/ar3.test2
-rwxr-xr-xtests/ar4.test2
-rwxr-xr-xtests/ar5.test2
-rwxr-xr-xtests/asm.test16
-rwxr-xr-xtests/asm2.test18
-rwxr-xr-xtests/asm3.test18
-rwxr-xr-xtests/autodist-acconfig-no-subdir.test2
-rwxr-xr-xtests/autodist-acconfig.test2
-rwxr-xr-xtests/autodist-aclocal-m4.test4
-rwxr-xr-xtests/autodist-config-headers.test2
-rwxr-xr-xtests/autodist-configure-no-subdir.test2
-rwxr-xr-xtests/autodist-stamp-vti.test2
-rwxr-xr-xtests/autodist-subdir.test2
-rwxr-xr-xtests/autodist.test2
-rwxr-xr-xtests/autohdr.test2
-rwxr-xr-xtests/autohdr2.test2
-rwxr-xr-xtests/autohdr3.test2
-rwxr-xr-xtests/autohdr4.test2
-rwxr-xr-xtests/autohdrdry.test2
-rwxr-xr-xtests/auxdir-autodetect.test4
-rwxr-xr-xtests/auxdir-computed.tap2
-rwxr-xr-xtests/auxdir-misplaced.test2
-rwxr-xr-xtests/auxdir-nonexistent.test4
-rwxr-xr-xtests/auxdir-unportable.tap4
-rwxr-xr-xtests/auxdir.test2
-rwxr-xr-xtests/auxdir6.test2
-rwxr-xr-xtests/auxdir7.test2
-rwxr-xr-xtests/auxdir8.test2
-rwxr-xr-xtests/backcompat2.test3
-rwxr-xr-xtests/backcompat3.test3
-rwxr-xr-xtests/backcompat4.test8
-rwxr-xr-xtests/backcompat5.test11
-rwxr-xr-xtests/backcompat6.test3
-rwxr-xr-xtests/backsl.test2
-rwxr-xr-xtests/backsl4.test2
-rwxr-xr-xtests/badline.test4
-rwxr-xr-xtests/badprog.test2
-rwxr-xr-xtests/candist.test2
-rwxr-xr-xtests/canon-name.test2
-rwxr-xr-xtests/canon.test2
-rwxr-xr-xtests/canon3.test2
-rwxr-xr-xtests/canon4.test2
-rwxr-xr-xtests/canon5.test2
-rwxr-xr-xtests/canon6.test2
-rwxr-xr-xtests/canon7.test2
-rwxr-xr-xtests/canon8.test2
-rwxr-xr-xtests/ccnoco.test2
-rwxr-xr-xtests/ccnoco2.test2
-rwxr-xr-xtests/ccnoco3.test2
-rwxr-xr-xtests/check-concurrency-bug9245.test2
-rwxr-xr-xtests/check-exported-srcdir.test2
-rwxr-xr-xtests/check-fd-redirect.test2
-rwxr-xr-xtests/check-subst-prog.test2
-rwxr-xr-xtests/check-subst.test2
-rwxr-xr-xtests/check-tests-in-builddir.test2
-rwxr-xr-xtests/check10.test2
-rwxr-xr-xtests/check11.test2
-rwxr-xr-xtests/check12.test2
-rwxr-xr-xtests/check2.test2
-rwxr-xr-xtests/check3.test2
-rwxr-xr-xtests/check4.test2
-rwxr-xr-xtests/check5.test2
-rwxr-xr-xtests/check6.test2
-rwxr-xr-xtests/check7.test2
-rwxr-xr-xtests/check8.test2
-rwxr-xr-xtests/clean2.test2
-rwxr-xr-xtests/colneq2.test2
-rwxr-xr-xtests/colneq3.test2
-rwxr-xr-xtests/colon.test2
-rwxr-xr-xtests/colon2.test2
-rwxr-xr-xtests/colon3.test2
-rwxr-xr-xtests/colon4.test2
-rwxr-xr-xtests/colon5.test2
-rwxr-xr-xtests/colon6.test2
-rwxr-xr-xtests/colon7.test2
-rwxr-xr-xtests/color.test2
-rwxr-xr-xtests/color2.test2
-rwxr-xr-xtests/comment2.test2
-rwxr-xr-xtests/comment4.test2
-rwxr-xr-xtests/comment5.test2
-rwxr-xr-xtests/comment6.test2
-rwxr-xr-xtests/comment7.test2
-rwxr-xr-xtests/comment8.test2
-rwxr-xr-xtests/comments-in-var-def.test2
-rwxr-xr-xtests/compile4.test2
-rwxr-xr-xtests/compile5.test2
-rwxr-xr-xtests/compile_f90_c_cxx.test2
-rwxr-xr-xtests/compile_f_c_cxx.test2
-rwxr-xr-xtests/cond-basic.test2
-rwxr-xr-xtests/cond.test2
-rwxr-xr-xtests/cond10.test2
-rwxr-xr-xtests/cond11.test2
-rwxr-xr-xtests/cond13.test2
-rwxr-xr-xtests/cond14.test2
-rwxr-xr-xtests/cond15.test2
-rwxr-xr-xtests/cond16.test2
-rwxr-xr-xtests/cond17.test2
-rwxr-xr-xtests/cond18.test2
-rwxr-xr-xtests/cond19.test2
-rwxr-xr-xtests/cond2.test2
-rwxr-xr-xtests/cond20.test2
-rwxr-xr-xtests/cond21.test2
-rwxr-xr-xtests/cond22.test2
-rwxr-xr-xtests/cond23.test2
-rwxr-xr-xtests/cond24.test4
-rwxr-xr-xtests/cond25.test2
-rwxr-xr-xtests/cond26.test2
-rwxr-xr-xtests/cond27.test2
-rwxr-xr-xtests/cond28.test2
-rwxr-xr-xtests/cond29.test4
-rwxr-xr-xtests/cond3.test2
-rwxr-xr-xtests/cond30.test2
-rwxr-xr-xtests/cond31.test2
-rwxr-xr-xtests/cond32.test2
-rwxr-xr-xtests/cond33.test2
-rwxr-xr-xtests/cond34.test2
-rwxr-xr-xtests/cond35.test2
-rwxr-xr-xtests/cond36.test2
-rwxr-xr-xtests/cond37.test2
-rwxr-xr-xtests/cond38.test2
-rwxr-xr-xtests/cond39.test2
-rwxr-xr-xtests/cond4.test2
-rwxr-xr-xtests/cond40.test2
-rwxr-xr-xtests/cond41.test4
-rwxr-xr-xtests/cond42.test16
-rwxr-xr-xtests/cond43.test8
-rwxr-xr-xtests/cond44.test2
-rwxr-xr-xtests/cond45.test2
-rwxr-xr-xtests/cond46.test2
-rwxr-xr-xtests/cond5.test2
-rwxr-xr-xtests/cond6.test4
-rwxr-xr-xtests/cond7.test2
-rwxr-xr-xtests/cond8.test2
-rwxr-xr-xtests/cond9.test2
-rwxr-xr-xtests/condd.test2
-rwxr-xr-xtests/condhook.test2
-rwxr-xr-xtests/condhook2.test2
-rwxr-xr-xtests/condinc.test2
-rwxr-xr-xtests/condinc2.test2
-rwxr-xr-xtests/condlib.test2
-rwxr-xr-xtests/condman3.test2
-rwxr-xr-xtests/conff.test2
-rwxr-xr-xtests/conff2.test8
-rwxr-xr-xtests/conffile-leading-dot.test18
-rwxr-xr-xtests/confh.test2
-rwxr-xr-xtests/confh4.test2
-rwxr-xr-xtests/confh5.test2
-rwxr-xr-xtests/confh6.test2
-rwxr-xr-xtests/confh7.test4
-rwxr-xr-xtests/confh8.test2
-rwxr-xr-xtests/confincl.test2
-rwxr-xr-xtests/conflnk.test2
-rwxr-xr-xtests/conflnk2.test2
-rwxr-xr-xtests/conflnk3.test2
-rwxr-xr-xtests/conflnk4.test2
-rwxr-xr-xtests/confsub.test2
-rwxr-xr-xtests/confvar.test2
-rwxr-xr-xtests/confvar2.test2
-rwxr-xr-xtests/copy.test4
-rwxr-xr-xtests/cscope.tap2
-rwxr-xr-xtests/cscope2.test2
-rwxr-xr-xtests/cscope3.test2
-rwxr-xr-xtests/cxx.test2
-rwxr-xr-xtests/cxx2.test2
-rwxr-xr-xtests/cxxcpp.test2
-rwxr-xr-xtests/cxxlibobj.test2
-rwxr-xr-xtests/cxxlink.test2
-rwxr-xr-xtests/cxxnoc.test2
-rwxr-xr-xtests/cxxo.test2
-rwxr-xr-xtests/cygnus-check-without-all.test2
-rwxr-xr-xtests/cygnus-dependency-tracking.test2
-rwxr-xr-xtests/cygnus-imply-foreign.test12
-rwxr-xr-xtests/cygnus-no-dist.test8
-rwxr-xr-xtests/cygnus-no-installinfo.test2
-rwxr-xr-xtests/cygnus-requires-maintainer-mode.test8
-rwxr-xr-xtests/cygwin32.test2
-rw-r--r--tests/defs6
-rw-r--r--tests/defs-static.in10
-rwxr-xr-xtests/defun.test2
-rwxr-xr-xtests/defun2.test2
-rwxr-xr-xtests/dejagnu-absolute-builddir.test2
-rwxr-xr-xtests/dejagnu-relative-srcdir.test2
-rwxr-xr-xtests/dejagnu-siteexp-append.test2
-rwxr-xr-xtests/dejagnu-siteexp-extend.test2
-rwxr-xr-xtests/dejagnu-siteexp-useredit.test2
-rwxr-xr-xtests/dejagnu2.test2
-rwxr-xr-xtests/dejagnu3.test2
-rwxr-xr-xtests/dejagnu4.test2
-rwxr-xr-xtests/dejagnu5.test2
-rwxr-xr-xtests/dejagnu6.test2
-rwxr-xr-xtests/dejagnu7.test2
-rwxr-xr-xtests/deleted-am.test2
-rwxr-xr-xtests/deleted-m4.test2
-rwxr-xr-xtests/depacl2.test2
-rwxr-xr-xtests/depcomp.sh2
-rwxr-xr-xtests/depcomp.test2
-rwxr-xr-xtests/depcomp2.test2
-rwxr-xr-xtests/depcomp8a.test6
-rwxr-xr-xtests/depcomp8b.test6
-rwxr-xr-xtests/depdist.test4
-rwxr-xr-xtests/depend.test2
-rwxr-xr-xtests/depend3.test2
-rwxr-xr-xtests/depend4.test2
-rwxr-xr-xtests/depend5.test2
-rwxr-xr-xtests/depend6.test2
-rwxr-xr-xtests/deprecated-acinit.test10
-rwxr-xr-xtests/destdir.test2
-rwxr-xr-xtests/dirlist-abspath.test2
-rwxr-xr-xtests/dirlist.test2
-rwxr-xr-xtests/dirlist2.test2
-rwxr-xr-xtests/discover.test2
-rwxr-xr-xtests/dist-auxdir-many-subdirs.test6
-rwxr-xr-xtests/dist-auxfile-2.test2
-rwxr-xr-xtests/dist-auxfile.test8
-rwxr-xr-xtests/dist-formats.tap12
-rwxr-xr-xtests/dist-included-parent-dir.test2
-rwxr-xr-xtests/dist-missing-am.test2
-rwxr-xr-xtests/dist-missing-included-m4.test2
-rwxr-xr-xtests/dist-missing-m4.test2
-rwxr-xr-xtests/dist-readonly.test2
-rwxr-xr-xtests/dist-repeated.test2
-rwxr-xr-xtests/distcheck-configure-flags-am.test2
-rwxr-xr-xtests/distcheck-configure-flags-subpkg.test8
-rwxr-xr-xtests/distcheck-configure-flags.test2
-rwxr-xr-xtests/distcheck-hook.test2
-rwxr-xr-xtests/distcheck-hook2.test4
-rwxr-xr-xtests/distcheck-missing-m4.test4
-rwxr-xr-xtests/distcheck-outdated-m4.test6
-rwxr-xr-xtests/distcheck-override-infodir.test2
-rwxr-xr-xtests/distcheck-pr10470.test2
-rwxr-xr-xtests/distcheck-pr9579.test2
-rwxr-xr-xtests/distcleancheck.test2
-rwxr-xr-xtests/distcom-subdir.test2
-rwxr-xr-xtests/distcom2.test4
-rwxr-xr-xtests/distcom4.test2
-rwxr-xr-xtests/distcom5.test2
-rwxr-xr-xtests/distdir.test2
-rwxr-xr-xtests/distlinks.test2
-rwxr-xr-xtests/distlinksbrk.test2
-rwxr-xr-xtests/distname.test2
-rwxr-xr-xtests/dmalloc.test2
-rwxr-xr-xtests/doc-parsing-buglets-tabs.test2
-rwxr-xr-xtests/dollar.test2
-rwxr-xr-xtests/dollarvar.test2
-rwxr-xr-xtests/dollarvar2.test2
-rwxr-xr-xtests/double.test2
-rwxr-xr-xtests/dup2.test2
-rwxr-xr-xtests/else.test2
-rwxr-xr-xtests/empty.test2
-rwxr-xr-xtests/empty2.test2
-rwxr-xr-xtests/empty3.test2
-rwxr-xr-xtests/empty4.test2
-rwxr-xr-xtests/exdir3.test2
-rwxr-xr-xtests/exeext.test2
-rwxr-xr-xtests/exeext2.test2
-rwxr-xr-xtests/exeext3.test2
-rwxr-xr-xtests/exeext4.test2
-rwxr-xr-xtests/exsource.test2
-rwxr-xr-xtests/ext.test2
-rwxr-xr-xtests/ext2.test2
-rwxr-xr-xtests/ext3.test2
-rwxr-xr-xtests/extra-portability.test2
-rwxr-xr-xtests/extra-portability2.test2
-rwxr-xr-xtests/extra-portability3.test2
-rwxr-xr-xtests/extra-programs-empty.test2
-rwxr-xr-xtests/extra.test2
-rwxr-xr-xtests/extra10.test2
-rwxr-xr-xtests/extra11.test2
-rwxr-xr-xtests/extra12.test2
-rwxr-xr-xtests/extra2.test2
-rwxr-xr-xtests/extra3.test2
-rwxr-xr-xtests/extra4.test2
-rwxr-xr-xtests/extra5.test2
-rwxr-xr-xtests/extra6.test2
-rwxr-xr-xtests/extra7.test2
-rwxr-xr-xtests/extra8.test2
-rwxr-xr-xtests/extra9.test2
-rwxr-xr-xtests/extradep.test2
-rwxr-xr-xtests/extradep2.test2
-rwxr-xr-xtests/f90only.test2
-rwxr-xr-xtests/flavor.test2
-rwxr-xr-xtests/flibs.test2
-rwxr-xr-xtests/fn99.test2
-rwxr-xr-xtests/fn99subdir.test4
-rwxr-xr-xtests/fnoc.test2
-rwxr-xr-xtests/fo.test2
-rwxr-xr-xtests/fonly.test2
-rwxr-xr-xtests/fort2.test2
-rwxr-xr-xtests/fort4.test2
-rwxr-xr-xtests/fort5.test2
-rwxr-xr-xtests/fortdep.test2
-rwxr-xr-xtests/gcj.test2
-rwxr-xr-xtests/gcj2.test2
-rwxr-xr-xtests/gcj3.test2
-rwxr-xr-xtests/gcj4.test2
-rwxr-xr-xtests/gcj5.test2
-rwxr-xr-xtests/gcj6.test2
-rwxr-xr-xtests/gettext-macros.test4
-rwxr-xr-xtests/gettext.test6
-rwxr-xr-xtests/gettext2.test2
-rwxr-xr-xtests/gettext3.test2
-rwxr-xr-xtests/gnits.test4
-rwxr-xr-xtests/gnits2.test2
-rwxr-xr-xtests/gnits3.test2
-rwxr-xr-xtests/gnumake.test2
-rwxr-xr-xtests/gnuwarn.test2
-rwxr-xr-xtests/gnuwarn2.test4
-rwxr-xr-xtests/hdr-vars-defined-once.test2
-rwxr-xr-xtests/header.test2
-rwxr-xr-xtests/help-depend.test2
-rwxr-xr-xtests/help-depend2.test2
-rwxr-xr-xtests/help-dmalloc.test2
-rwxr-xr-xtests/help-init.test2
-rwxr-xr-xtests/help-lispdir.test2
-rwxr-xr-xtests/help-multilib.test2
-rwxr-xr-xtests/help-python.test2
-rwxr-xr-xtests/help-silent.test8
-rwxr-xr-xtests/help-upc.test2
-rwxr-xr-xtests/help.test2
-rwxr-xr-xtests/help2.test10
-rwxr-xr-xtests/help3.test2
-rwxr-xr-xtests/hfs.test2
-rwxr-xr-xtests/implicit.test2
-rwxr-xr-xtests/init.test6
-rwxr-xr-xtests/init2.test2
-rwxr-xr-xtests/insh2.test2
-rwxr-xr-xtests/install-info-dir.test2
-rwxr-xr-xtests/install2.test2
-rwxr-xr-xtests/instdat.test2
-rwxr-xr-xtests/instdir-java.test2
-rwxr-xr-xtests/instdir-lisp.test2
-rwxr-xr-xtests/instdir-ltlib.test2
-rwxr-xr-xtests/instdir-prog.test2
-rwxr-xr-xtests/instdir-python.test2
-rwxr-xr-xtests/instdir-texi.test2
-rwxr-xr-xtests/instdir.test2
-rwxr-xr-xtests/instdir2.test2
-rwxr-xr-xtests/instfail-info.test2
-rwxr-xr-xtests/instfail-java.test2
-rwxr-xr-xtests/instfail-libtool.test2
-rwxr-xr-xtests/instfail.test2
-rwxr-xr-xtests/insthook.test2
-rwxr-xr-xtests/instman.test2
-rwxr-xr-xtests/instmany-mans.test2
-rwxr-xr-xtests/instmany-python.test2
-rwxr-xr-xtests/instmany.test2
-rwxr-xr-xtests/instsh.test2
-rwxr-xr-xtests/instspc.tap2
-rwxr-xr-xtests/interp.test2
-rwxr-xr-xtests/interp2.test2
-rwxr-xr-xtests/java-check.test2
-rwxr-xr-xtests/java-clean.test2
-rwxr-xr-xtests/java-compile-install.test2
-rwxr-xr-xtests/java-compile-run-flat.test4
-rwxr-xr-xtests/java-compile-run-nested.test4
-rwxr-xr-xtests/java-empty-classpath.test2
-rwxr-xr-xtests/java-extra.test2
-rwxr-xr-xtests/java-mix.test2
-rwxr-xr-xtests/java-nobase.test2
-rwxr-xr-xtests/java-noinst.test2
-rwxr-xr-xtests/java-rebuild.test2
-rwxr-xr-xtests/java-sources.test2
-rwxr-xr-xtests/java-uninstall.test2
-rwxr-xr-xtests/java.test2
-rwxr-xr-xtests/java2.test2
-rwxr-xr-xtests/java3.test2
-rwxr-xr-xtests/javaflags.test2
-rwxr-xr-xtests/javaprim.test2
-rwxr-xr-xtests/javasubst.test2
-rwxr-xr-xtests/ldadd.test2
-rwxr-xr-xtests/ldflags.test2
-rwxr-xr-xtests/lex-clean-cxx.test2
-rwxr-xr-xtests/lex-clean.test2
-rwxr-xr-xtests/lex-depend-cxx.test2
-rwxr-xr-xtests/lex-depend-grep.test2
-rwxr-xr-xtests/lex-depend.test2
-rwxr-xr-xtests/lex-lib-external.test2
-rwxr-xr-xtests/lex-lib.test2
-rwxr-xr-xtests/lex-libobj.test2
-rwxr-xr-xtests/lex-line.test2
-rwxr-xr-xtests/lex-nodist.test2
-rwxr-xr-xtests/lex-noyywrap.test2
-rwxr-xr-xtests/lex-pr204.test2
-rwxr-xr-xtests/lex-subobj-nodep.test2
-rwxr-xr-xtests/lex.test2
-rwxr-xr-xtests/lex2.test2
-rwxr-xr-xtests/lex3.test2
-rwxr-xr-xtests/lex5.test2
-rwxr-xr-xtests/lexcpp.test2
-rwxr-xr-xtests/lexvpath.test2
-rwxr-xr-xtests/lflags.test2
-rwxr-xr-xtests/lflags2.test2
-rwxr-xr-xtests/libexec.test2
-rwxr-xr-xtests/libobj-basic.test6
-rwxr-xr-xtests/libobj10.test2
-rwxr-xr-xtests/libobj12.test2
-rwxr-xr-xtests/libobj13.test2
-rwxr-xr-xtests/libobj14.test2
-rwxr-xr-xtests/libobj15a.test4
-rwxr-xr-xtests/libobj15b.test4
-rwxr-xr-xtests/libobj15c.test8
-rwxr-xr-xtests/libobj16a.test10
-rwxr-xr-xtests/libobj16b.test10
-rwxr-xr-xtests/libobj17.test2
-rwxr-xr-xtests/libobj18.test8
-rwxr-xr-xtests/libobj19.test8
-rwxr-xr-xtests/libobj2.test2
-rwxr-xr-xtests/libobj20a.test2
-rwxr-xr-xtests/libobj20b.test6
-rwxr-xr-xtests/libobj20c.test6
-rwxr-xr-xtests/libobj3.test4
-rwxr-xr-xtests/libobj4.test2
-rwxr-xr-xtests/libobj5.test2
-rwxr-xr-xtests/libobj7.test2
-rwxr-xr-xtests/library.test2
-rwxr-xr-xtests/library2.test2
-rwxr-xr-xtests/library3.test2
-rwxr-xr-xtests/libtoo10.test2
-rwxr-xr-xtests/libtoo11.test2
-rwxr-xr-xtests/libtool-macros.test2
-rwxr-xr-xtests/libtool.test2
-rwxr-xr-xtests/libtool2.test2
-rwxr-xr-xtests/libtool3.test2
-rwxr-xr-xtests/libtool4.test2
-rwxr-xr-xtests/libtool5.test2
-rwxr-xr-xtests/libtool6.test2
-rwxr-xr-xtests/libtool7.test2
-rwxr-xr-xtests/libtool8.test2
-rwxr-xr-xtests/libtool9.test2
-rwxr-xr-xtests/license.test2
-rwxr-xr-xtests/link_c_cxx.test2
-rwxr-xr-xtests/link_dist.test2
-rwxr-xr-xtests/link_f90_only.test2
-rwxr-xr-xtests/link_f_only.test2
-rwxr-xr-xtests/link_fc.test2
-rwxr-xr-xtests/link_fccxx.test2
-rwxr-xr-xtests/link_fcxx.test2
-rwxr-xr-xtests/link_override.test2
-rwxr-xr-xtests/lisp3.test2
-rwxr-xr-xtests/lisp4.test2
-rwxr-xr-xtests/lisp5.test2
-rwxr-xr-xtests/lisp6.test2
-rwxr-xr-xtests/lisp7.test2
-rwxr-xr-xtests/lisp8.test2
-rwxr-xr-xtests/lispdry.test2
-rwxr-xr-xtests/listval.test2
-rwxr-xr-xtests/location.test2
-rwxr-xr-xtests/ltcond.test2
-rwxr-xr-xtests/ltcond2.test2
-rwxr-xr-xtests/ltconv.test2
-rwxr-xr-xtests/ltdeps.test2
-rwxr-xr-xtests/ltinit.test2
-rwxr-xr-xtests/ltinstloc.test2
-rwxr-xr-xtests/ltlibobjs.test2
-rwxr-xr-xtests/ltlibsrc.test2
-rwxr-xr-xtests/ltorder.test2
-rwxr-xr-xtests/lzma.test4
-rwxr-xr-xtests/m4-inclusion.test2
-rwxr-xr-xtests/maintclean-vpath.test2
-rwxr-xr-xtests/maintclean.test2
-rwxr-xr-xtests/maintmode-configure-msg.test4
-rwxr-xr-xtests/make-dryrun.tap2
-rwxr-xr-xtests/make.test4
-rwxr-xr-xtests/makej.test2
-rwxr-xr-xtests/makej2.test2
-rwxr-xr-xtests/maken.test2
-rwxr-xr-xtests/maken3.test2
-rwxr-xr-xtests/man2.test2
-rwxr-xr-xtests/man3.test2
-rwxr-xr-xtests/man4.test2
-rwxr-xr-xtests/man5.test2
-rwxr-xr-xtests/man6.test2
-rwxr-xr-xtests/man7.test2
-rwxr-xr-xtests/man8.test2
-rwxr-xr-xtests/mdate3.test2
-rwxr-xr-xtests/mdate4.test2
-rwxr-xr-xtests/missing-auxfile-stops-makefiles-creation.test4
-rwxr-xr-xtests/missing.test2
-rwxr-xr-xtests/missing2.test2
-rwxr-xr-xtests/missing4.test2
-rwxr-xr-xtests/missing5.test2
-rwxr-xr-xtests/missing6.test20
-rwxr-xr-xtests/mkinst2.test2
-rwxr-xr-xtests/mmode.test14
-rwxr-xr-xtests/mmodely.test2
-rwxr-xr-xtests/multlib.test6
-rwxr-xr-xtests/no-extra-makefile-code.test2
-rwxr-xr-xtests/nobase-libtool.test2
-rwxr-xr-xtests/nobase-nodist.test2
-rwxr-xr-xtests/nobase-python.test2
-rwxr-xr-xtests/nobase.test2
-rwxr-xr-xtests/nodef.test4
-rwxr-xr-xtests/nodef2.test4
-rwxr-xr-xtests/nodep.test2
-rwxr-xr-xtests/nodep2.test2
-rwxr-xr-xtests/nodist.test2
-rwxr-xr-xtests/nodist2.test2
-rwxr-xr-xtests/nodist3.test2
-rwxr-xr-xtests/noinstdir.test2
-rwxr-xr-xtests/nostdinc.test2
-rwxr-xr-xtests/notrans.test2
-rwxr-xr-xtests/number.test2
-rwxr-xr-xtests/objc.test2
-rwxr-xr-xtests/objc2.test2
-rwxr-xr-xtests/objext-pr10128.test2
-rwxr-xr-xtests/obsolete.test14
-rwxr-xr-xtests/order.test2
-rwxr-xr-xtests/output-order.test2
-rwxr-xr-xtests/output.test2
-rwxr-xr-xtests/output10.test2
-rwxr-xr-xtests/output11.test2
-rwxr-xr-xtests/output12.test2
-rwxr-xr-xtests/output13.test2
-rwxr-xr-xtests/output2.test2
-rwxr-xr-xtests/output3.test2
-rwxr-xr-xtests/output4.test2
-rwxr-xr-xtests/output5.test2
-rwxr-xr-xtests/output6.test2
-rwxr-xr-xtests/output7.test2
-rwxr-xr-xtests/output8.test4
-rwxr-xr-xtests/output9.test2
-rwxr-xr-xtests/override-conditional-1.test2
-rwxr-xr-xtests/override-conditional-2.test2
-rwxr-xr-xtests/parallel-am.test4
-rwxr-xr-xtests/parallel-am2.test2
-rwxr-xr-xtests/parallel-am3.test4
-rwxr-xr-xtests/parallel-tests-cmdline-override.test2
-rwxr-xr-xtests/parallel-tests-console-output.test2
-rwxr-xr-xtests/parallel-tests-driver-install.test6
-rwxr-xr-xtests/parallel-tests-dry-run-1.test2
-rwxr-xr-xtests/parallel-tests-dry-run-2.test2
-rwxr-xr-xtests/parallel-tests-empty-testlogs.test2
-rwxr-xr-xtests/parallel-tests-exeext.test2
-rwxr-xr-xtests/parallel-tests-exit-statuses.test2
-rwxr-xr-xtests/parallel-tests-extra-programs.test2
-rwxr-xr-xtests/parallel-tests-fd-redirect-exeext.test2
-rwxr-xr-xtests/parallel-tests-fd-redirect.test2
-rwxr-xr-xtests/parallel-tests-fork-bomb.test2
-rwxr-xr-xtests/parallel-tests-harderror.test2
-rwxr-xr-xtests/parallel-tests-interrupt.tap2
-rwxr-xr-xtests/parallel-tests-log-compiler-1.test2
-rwxr-xr-xtests/parallel-tests-log-compiler-2.test2
-rwxr-xr-xtests/parallel-tests-log-compiler-example.test2
-rwxr-xr-xtests/parallel-tests-log-override-1.test2
-rwxr-xr-xtests/parallel-tests-log-override-2.test2
-rwxr-xr-xtests/parallel-tests-log-override-recheck.test2
-rwxr-xr-xtests/parallel-tests-many.test2
-rwxr-xr-xtests/parallel-tests-no-color-in-log.test2
-rwxr-xr-xtests/parallel-tests-no-spurious-summary.test2
-rwxr-xr-xtests/parallel-tests-once.test2
-rwxr-xr-xtests/parallel-tests-reset-term.test2
-rwxr-xr-xtests/parallel-tests-subdir.test2
-rwxr-xr-xtests/parallel-tests-suffix-prog.test2
-rwxr-xr-xtests/parallel-tests-suffix.test2
-rwxr-xr-xtests/parallel-tests-trailing-bslash.test2
-rwxr-xr-xtests/parallel-tests-unreadable.test2
-rwxr-xr-xtests/parallel-tests.test2
-rwxr-xr-xtests/parallel-tests10.test2
-rwxr-xr-xtests/parallel-tests2.test2
-rwxr-xr-xtests/parallel-tests3.test2
-rwxr-xr-xtests/parallel-tests5.test2
-rwxr-xr-xtests/parallel-tests6.test2
-rwxr-xr-xtests/parallel-tests8.test2
-rwxr-xr-xtests/parallel-tests9.test2
-rwxr-xr-xtests/parse.test2
-rwxr-xr-xtests/percent.test2
-rwxr-xr-xtests/pluseq10.test2
-rwxr-xr-xtests/pluseq11.test2
-rwxr-xr-xtests/pluseq2.test2
-rwxr-xr-xtests/pluseq3.test2
-rwxr-xr-xtests/pluseq4.test2
-rwxr-xr-xtests/pluseq5.test2
-rwxr-xr-xtests/pluseq6.test2
-rwxr-xr-xtests/pluseq7.test2
-rwxr-xr-xtests/pluseq9.test2
-rwxr-xr-xtests/posixsubst-data.test2
-rwxr-xr-xtests/posixsubst-extradist.test2
-rwxr-xr-xtests/posixsubst-ldadd.test2
-rwxr-xr-xtests/posixsubst-libraries.test2
-rwxr-xr-xtests/posixsubst-ltlibraries.test2
-rwxr-xr-xtests/posixsubst-programs.test2
-rwxr-xr-xtests/posixsubst-scripts.test2
-rwxr-xr-xtests/posixsubst-sources.test2
-rwxr-xr-xtests/posixsubst-tests.test2
-rwxr-xr-xtests/postproc.test2
-rwxr-xr-xtests/ppf77.test2
-rwxr-xr-xtests/pr2.test4
-rwxr-xr-xtests/pr211.test2
-rwxr-xr-xtests/pr220.test2
-rwxr-xr-xtests/pr224.test2
-rwxr-xr-xtests/pr229.test2
-rwxr-xr-xtests/pr243.test4
-rwxr-xr-xtests/pr266.test2
-rwxr-xr-xtests/pr279-2.test2
-rwxr-xr-xtests/pr279.test2
-rwxr-xr-xtests/pr287.test2
-rwxr-xr-xtests/pr300-lib.test2
-rwxr-xr-xtests/pr300-ltlib.test2
-rwxr-xr-xtests/pr300-prog.test2
-rwxr-xr-xtests/pr307.test2
-rwxr-xr-xtests/pr401.test14
-rwxr-xr-xtests/pr401b.test14
-rwxr-xr-xtests/pr401c.test14
-rwxr-xr-xtests/pr72.test2
-rwxr-xr-xtests/pr8365-remake-timing.test14
-rwxr-xr-xtests/pr87.test2
-rwxr-xr-xtests/pr9.test2
-rwxr-xr-xtests/prefix.test2
-rwxr-xr-xtests/primary-prefix-couples-documented-valid.test2
-rwxr-xr-xtests/primary-prefix-couples-force-valid.test2
-rwxr-xr-xtests/primary-prefix-invalid-couples.tap2
-rwxr-xr-xtests/primary-prefix-valid-couples.test2
-rwxr-xr-xtests/primary2.test2
-rwxr-xr-xtests/primary3.test2
-rwxr-xr-xtests/programs-primary-rewritten.test2
-rwxr-xr-xtests/python-dist.test2
-rwxr-xr-xtests/python-vars.test2
-rwxr-xr-xtests/python-virtualenv.test2
-rwxr-xr-xtests/python.test2
-rwxr-xr-xtests/python10.test2
-rwxr-xr-xtests/python11.test6
-rwxr-xr-xtests/python12.test2
-rwxr-xr-xtests/python3.test2
-rwxr-xr-xtests/python4.test2
-rwxr-xr-xtests/python5.test2
-rwxr-xr-xtests/python5b.test2
-rwxr-xr-xtests/python6.test2
-rwxr-xr-xtests/python7.test2
-rwxr-xr-xtests/python8.test2
-rwxr-xr-xtests/python9.test2
-rwxr-xr-xtests/recurs.test2
-rwxr-xr-xtests/remake-all-1.test4
-rwxr-xr-xtests/remake-all-2.test4
-rwxr-xr-xtests/remake-am-pr10111.test4
-rwxr-xr-xtests/remake-deleted-am-2.test2
-rwxr-xr-xtests/remake-deleted-am-subdir.test2
-rwxr-xr-xtests/remake-deleted-am.test2
-rwxr-xr-xtests/remake-deleted-m4-file.test6
-rwxr-xr-xtests/remake-gnulib-add-acsubst.test2
-rwxr-xr-xtests/remake-gnulib-add-header.test2
-rwxr-xr-xtests/remake-gnulib-remove-header.test2
-rwxr-xr-xtests/remake-m4-pr10111.test4
-rwxr-xr-xtests/remake-moved-m4-file.test2
-rwxr-xr-xtests/remake-renamed-am.test2
-rwxr-xr-xtests/remake-renamed-m4-file.test2
-rwxr-xr-xtests/remake-renamed-m4-macro-and-file.test6
-rwxr-xr-xtests/remake-renamed-m4-macro.test4
-rwxr-xr-xtests/remake-subdir-from-subdir.test2
-rwxr-xr-xtests/remake-subdir-gnu.test6
-rwxr-xr-xtests/remake-subdir-long-time.test6
-rwxr-xr-xtests/remake-subdir.test6
-rwxr-xr-xtests/remake-subdir2.test6
-rwxr-xr-xtests/remake.test2
-rwxr-xr-xtests/remake10a.test2
-rwxr-xr-xtests/remake10b.test2
-rwxr-xr-xtests/remake10c.test2
-rwxr-xr-xtests/remake11.test16
-rwxr-xr-xtests/remake12.test8
-rwxr-xr-xtests/remake1a.test2
-rwxr-xr-xtests/remake2.test2
-rwxr-xr-xtests/remake3.test2
-rwxr-xr-xtests/remake3a.test2
-rwxr-xr-xtests/remake4.test2
-rwxr-xr-xtests/remake5.test4
-rwxr-xr-xtests/remake6.test2
-rwxr-xr-xtests/remake7.test2
-rwxr-xr-xtests/remake8a.test16
-rwxr-xr-xtests/remake8b.test16
-rwxr-xr-xtests/remake9a.test14
-rwxr-xr-xtests/remake9b.test2
-rwxr-xr-xtests/remake9c.test2
-rwxr-xr-xtests/remake9d.test2
-rwxr-xr-xtests/repeated-options.test2
-rwxr-xr-xtests/req.test2
-rwxr-xr-xtests/reqd.test2
-rwxr-xr-xtests/reqd2.test4
-rwxr-xr-xtests/sanity.test2
-rwxr-xr-xtests/seenc.test2
-rwxr-xr-xtests/self-check-dir.tap2
-rwxr-xr-xtests/silent-configsite.test16
-rwxr-xr-xtests/silent-lex.test2
-rwxr-xr-xtests/silent-many-gcc.test2
-rwxr-xr-xtests/silent-many-generic.test2
-rwxr-xr-xtests/silent-nested-vars.test2
-rwxr-xr-xtests/silent-nowarn.test2
-rwxr-xr-xtests/silent-yacc-headers.test2
-rwxr-xr-xtests/silent-yacc.test2
-rwxr-xr-xtests/silent.test2
-rwxr-xr-xtests/silent2.test2
-rwxr-xr-xtests/silent3.test2
-rwxr-xr-xtests/silent4.test2
-rwxr-xr-xtests/silent6.test8
-rwxr-xr-xtests/silent7.test2
-rwxr-xr-xtests/silent8.test2
-rwxr-xr-xtests/silent9.test2
-rwxr-xr-xtests/silentcxx-gcc.test2
-rwxr-xr-xtests/silentcxx.test2
-rwxr-xr-xtests/silentf77.test2
-rwxr-xr-xtests/silentf90.test2
-rwxr-xr-xtests/space.test2
-rwxr-xr-xtests/specflg-dummy.test2
-rwxr-xr-xtests/specflg.test2
-rwxr-xr-xtests/specflg10.test2
-rwxr-xr-xtests/specflg2.test2
-rwxr-xr-xtests/specflg3.test2
-rwxr-xr-xtests/specflg6.test2
-rwxr-xr-xtests/specflg7.test2
-rwxr-xr-xtests/specflg8.test2
-rwxr-xr-xtests/specflg9.test2
-rwxr-xr-xtests/spell2.test2
-rwxr-xr-xtests/srcsub.test2
-rwxr-xr-xtests/srcsub2.test2
-rwxr-xr-xtests/stamph2.test2
-rwxr-xr-xtests/stdinc.test2
-rwxr-xr-xtests/stdlib.test2
-rwxr-xr-xtests/stdlib2.test2
-rwxr-xr-xtests/strictness-override.test20
-rwxr-xr-xtests/strictness-precedence.test6
-rwxr-xr-xtests/strip.test2
-rwxr-xr-xtests/strip2.test2
-rwxr-xr-xtests/strip3.test2
-rwxr-xr-xtests/subcond.test2
-rwxr-xr-xtests/subcond2.test2
-rwxr-xr-xtests/subcond3.test2
-rwxr-xr-xtests/subdir.test2
-rwxr-xr-xtests/subdir10.test2
-rwxr-xr-xtests/subdir2.test2
-rwxr-xr-xtests/subdir3.test2
-rwxr-xr-xtests/subdir4.test2
-rwxr-xr-xtests/subdir5.test16
-rwxr-xr-xtests/subdir6.test2
-rwxr-xr-xtests/subdir7.test2
-rwxr-xr-xtests/subdir8.test8
-rwxr-xr-xtests/subdir9.test2
-rwxr-xr-xtests/subdirbuiltsources.test2
-rwxr-xr-xtests/subobj.test2
-rwxr-xr-xtests/subobj10.test2
-rwxr-xr-xtests/subobj11a.test2
-rwxr-xr-xtests/subobj11b.test2
-rwxr-xr-xtests/subobj11c.test2
-rwxr-xr-xtests/subobj2.test2
-rwxr-xr-xtests/subobj4.test2
-rwxr-xr-xtests/subobj5.test2
-rwxr-xr-xtests/subobj6.test2
-rwxr-xr-xtests/subobj7.test2
-rwxr-xr-xtests/subobj8.test2
-rwxr-xr-xtests/subobj9.test2
-rwxr-xr-xtests/subobjname.test2
-rwxr-xr-xtests/subpkg-yacc.test2
-rwxr-xr-xtests/subpkg.test2
-rwxr-xr-xtests/subpkg2.test2
-rwxr-xr-xtests/subpkg3.test4
-rwxr-xr-xtests/subpkg4.test4
-rwxr-xr-xtests/subst-no-trailing-empty-line.test2
-rwxr-xr-xtests/subst.test2
-rwxr-xr-xtests/subst3.test2
-rwxr-xr-xtests/subst4.test2
-rwxr-xr-xtests/subst5.test2
-rwxr-xr-xtests/substre2.test2
-rwxr-xr-xtests/substref.test2
-rwxr-xr-xtests/substtarg.test2
-rwxr-xr-xtests/suffix-chain.tap2
-rwxr-xr-xtests/suffix.test4
-rwxr-xr-xtests/suffix10.tap2
-rwxr-xr-xtests/suffix11.tap2
-rwxr-xr-xtests/suffix12.test2
-rwxr-xr-xtests/suffix13.test2
-rwxr-xr-xtests/suffix2.test2
-rwxr-xr-xtests/suffix3.tap2
-rwxr-xr-xtests/suffix5.test2
-rwxr-xr-xtests/suffix6b.test2
-rwxr-xr-xtests/suffix6c.test2
-rwxr-xr-xtests/suffix8.tap2
-rwxr-xr-xtests/suffix9.test2
-rwxr-xr-xtests/symlink.test6
-rwxr-xr-xtests/tags2.test2
-rwxr-xr-xtests/tagsub.test2
-rwxr-xr-xtests/tap-bad-prog.tap2
-rwxr-xr-xtests/tap-basic.test2
-rwxr-xr-xtests/tap-common-setup.test2
-rwxr-xr-xtests/tap-diagnostic-custom.test2
-rwxr-xr-xtests/tap-doc.test2
-rwxr-xr-xtests/tap-more.test2
-rwxr-xr-xtests/tap-more2.test2
-rwxr-xr-xtests/tap-recheck.test2
-rwxr-xr-xtests/tap-signal.tap2
-rwxr-xr-xtests/tap-summary-aux.sh2
-rwxr-xr-xtests/tar-override.test2
-rwxr-xr-xtests/tar.test2
-rwxr-xr-xtests/tar2.test2
-rwxr-xr-xtests/tar3.test6
-rwxr-xr-xtests/target-cflags.test2
-rwxr-xr-xtests/targetclash.test2
-rwxr-xr-xtests/test-driver-acsubst.test2
-rwxr-xr-xtests/test-driver-cond.test2
-rwxr-xr-xtests/test-driver-create-log-dir.test2
-rwxr-xr-xtests/test-driver-custom-multitest-recheck.test2
-rwxr-xr-xtests/test-driver-custom-multitest-recheck2.test2
-rwxr-xr-xtests/test-driver-custom-multitest.test2
-rwxr-xr-xtests/test-driver-custom-no-extra-driver.test2
-rwxr-xr-xtests/test-driver-custom-xfail-tests.test2
-rwxr-xr-xtests/test-driver-custom.test2
-rwxr-xr-xtests/test-driver-fail.test2
-rwxr-xr-xtests/test-driver-is-distributed.test2
-rwxr-xr-xtests/test-driver-strip-vpath.test4
-rwxr-xr-xtests/test-extensions-cond.test2
-rwxr-xr-xtests/test-extensions.test2
-rwxr-xr-xtests/test-harness-vpath-rewrite.test2
-rwxr-xr-xtests/test-log.test2
-rwxr-xr-xtests/test-logs-repeated.test2
-rwxr-xr-xtests/test-metadata-global-log.test2
-rwxr-xr-xtests/test-metadata-global-result.test2
-rwxr-xr-xtests/test-metadata-recheck.test2
-rwxr-xr-xtests/test-metadata-results.test2
-rwxr-xr-xtests/test-missing.test2
-rwxr-xr-xtests/test-missing2.test2
-rwxr-xr-xtests/test-trs-basic.test2
-rwxr-xr-xtests/test-trs-recover.test2
-rwxr-xr-xtests/test-trs-recover2.test2
-rwxr-xr-xtests/tests-environment-and-log-compiler.test2
-rwxr-xr-xtests/tests-environment-backcompat.test2
-rwxr-xr-xtests/tests-environment-fd-redirect.test2
-rwxr-xr-xtests/tests-environment.test2
-rwxr-xr-xtests/testsuite-summary-checks.sh2
-rwxr-xr-xtests/testsuite-summary-count-many.test2
-rwxr-xr-xtests/testsuite-summary-reference-log.test6
-rwxr-xr-xtests/transform.test2
-rwxr-xr-xtests/transform2.test2
-rwxr-xr-xtests/txinfo.test2
-rwxr-xr-xtests/txinfo13.test2
-rwxr-xr-xtests/txinfo16.test2
-rwxr-xr-xtests/txinfo18.test2
-rwxr-xr-xtests/txinfo19.test2
-rwxr-xr-xtests/txinfo2.test2
-rwxr-xr-xtests/txinfo20.test2
-rwxr-xr-xtests/txinfo21.test2
-rwxr-xr-xtests/txinfo22.test2
-rwxr-xr-xtests/txinfo23.test2
-rwxr-xr-xtests/txinfo24.test2
-rwxr-xr-xtests/txinfo25.test2
-rwxr-xr-xtests/txinfo26.test2
-rwxr-xr-xtests/txinfo27.test2
-rwxr-xr-xtests/txinfo28.test2
-rwxr-xr-xtests/txinfo29.test6
-rwxr-xr-xtests/txinfo3.test2
-rwxr-xr-xtests/txinfo30.test2
-rwxr-xr-xtests/txinfo32.test2
-rwxr-xr-xtests/txinfo33.test2
-rwxr-xr-xtests/txinfo5.test2
-rwxr-xr-xtests/txinfo5b.test2
-rwxr-xr-xtests/txinfo8.test2
-rwxr-xr-xtests/uninstall-fail.test2
-rwxr-xr-xtests/uninstall-pr9578.test2
-rwxr-xr-xtests/unused.test2
-rwxr-xr-xtests/upc.test2
-rwxr-xr-xtests/upc2.test2
-rwxr-xr-xtests/upc3.test2
-rwxr-xr-xtests/vala-mix.test2
-rwxr-xr-xtests/vala-vpath.test2
-rwxr-xr-xtests/vala.test2
-rwxr-xr-xtests/vala1.test2
-rwxr-xr-xtests/vala2.test2
-rwxr-xr-xtests/vala3.test2
-rwxr-xr-xtests/vala4.test10
-rwxr-xr-xtests/vala5.test2
-rwxr-xr-xtests/vartypo2.test2
-rwxr-xr-xtests/vartypos.test2
-rwxr-xr-xtests/version.test2
-rwxr-xr-xtests/version2.test2
-rwxr-xr-xtests/version7.test4
-rwxr-xr-xtests/version8.test2
-rwxr-xr-xtests/vtexi3.test2
-rwxr-xr-xtests/vtexi4.test2
-rwxr-xr-xtests/warning-groups-win-over-strictness.test2
-rwxr-xr-xtests/warnings-override.test18
-rwxr-xr-xtests/warnings-precedence.test6
-rwxr-xr-xtests/warnings-strictness-interactions.test4
-rwxr-xr-xtests/warnings-unknown.test4
-rwxr-xr-xtests/warnings-win-over-strictness.test10
-rwxr-xr-xtests/warnopts.test8
-rwxr-xr-xtests/werror2.test2
-rwxr-xr-xtests/werror3.test2
-rwxr-xr-xtests/werror4.test2
-rwxr-xr-xtests/whoami.test2
-rwxr-xr-xtests/xsource.test2
-rwxr-xr-xtests/yacc-auxdir.test2
-rwxr-xr-xtests/yacc-basic.test2
-rwxr-xr-xtests/yacc-bison-skeleton-cxx.test2
-rwxr-xr-xtests/yacc-bison-skeleton.test2
-rwxr-xr-xtests/yacc-clean-cxx.test2
-rwxr-xr-xtests/yacc-clean.test2
-rwxr-xr-xtests/yacc-cxx.test2
-rwxr-xr-xtests/yacc-d-basic.test2
-rwxr-xr-xtests/yacc-d-cxx.test2
-rwxr-xr-xtests/yacc-d-vpath.test2
-rwxr-xr-xtests/yacc-deleted-headers.test2
-rwxr-xr-xtests/yacc-depend.test2
-rwxr-xr-xtests/yacc-depend2.test2
-rwxr-xr-xtests/yacc-dist-nobuild-subdir.test2
-rwxr-xr-xtests/yacc-dist-nobuild.test2
-rwxr-xr-xtests/yacc-line.test2
-rwxr-xr-xtests/yacc-mix-c-cxx.test2
-rwxr-xr-xtests/yacc-nodist.test2
-rwxr-xr-xtests/yacc-pr204.test2
-rwxr-xr-xtests/yacc-weirdnames.test2
-rwxr-xr-xtests/yacc.test2
-rwxr-xr-xtests/yacc2.test4
-rwxr-xr-xtests/yacc4.test2
-rwxr-xr-xtests/yacc5.test2
-rwxr-xr-xtests/yacc7.test2
-rwxr-xr-xtests/yacc8.test2
-rwxr-xr-xtests/yaccdry.test2
-rwxr-xr-xtests/yaccpp.test2
-rwxr-xr-xtests/yaccvpath.test2
-rwxr-xr-xtests/yflags-cmdline-override.test2
-rwxr-xr-xtests/yflags-conditional.test2
-rwxr-xr-xtests/yflags-d-false-positives.test2
-rwxr-xr-xtests/yflags-force-conditional.test2
-rwxr-xr-xtests/yflags-force-override.test2
-rwxr-xr-xtests/yflags-var-expand.test2
-rwxr-xr-xtests/yflags.test2
-rwxr-xr-xtests/yflags2.test2
979 files changed, 1364 insertions, 1360 deletions
diff --git a/tests/README b/tests/README
index 529bc59e2..9d0b4f23f 100644
--- a/tests/README
+++ b/tests/README
@@ -199,11 +199,11 @@ Do
or `option-w0.tap' are *not* valid name for hand-written tests.
./defs brings in some commonly required files, and sets a skeleton
- configure.in. If possible, append to this file. In some cases
+ configure.ac. If possible, append to this file. In some cases
you'll have to overwrite it, but this should be the exception. Note
- that configure.in registers Makefile.in but do not output anything by
+ that configure.ac registers Makefile.in but do not output anything by
default. If you need ./configure to create Makefile, append AC_OUTPUT
- to configure.in. In case you don't want ./defs to pre-populate your
+ to configure.ac. In case you don't want ./defs to pre-populate your
test directory (which is a rare occurrence), set `$am_create_testdir'
to "empty" before sourcing ./defs.
@@ -244,9 +244,9 @@ Do
running `make' over grepping `Makefile.in' (or do both).
If you run $AUTOMAKE or $AUTOCONF several times in the same test
- and change `configure.in' by the meantime, do
+ and change `configure.ac' by the meantime, do
rm -rf autom4te.cache
- before the following runs. On fast machines the new `configure.in'
+ before the following runs. On fast machines the new `configure.ac'
could otherwise have the same timestamp as the old `autom4te.cache'.
Alternatively, use `--force' for subsequent runs of the tools.
diff --git a/tests/ac-output-old.tap b/tests/ac-output-old.tap
index 7518dd111..2d000c59a 100755
--- a/tests/ac-output-old.tap
+++ b/tests/ac-output-old.tap
@@ -22,7 +22,7 @@
plan_ 22
-rm -f configure.in depcomp # Not required.
+rm -f configure.ac depcomp # Not required.
# -----------------------------------------------------------------------
@@ -39,7 +39,7 @@ acoutbs_check ()
dir=acoutbs$1
mkdir $dir
cd $dir
- cat > configure.in
+ cat > configure.ac
touch Makefile.am zot.in
command_ok_ "aclocal groks '\\' in AC_OUTPUT ($dir)" $ACLOCAL
command_ok_ "automake groks '\\' in AC_OUTPUT ($dir)" $AUTOMAKE
@@ -73,7 +73,7 @@ END
# -----------------------------------------------------------------------
# Test for bug reported by Jerome Santini.
-# If I put this line in my configure.in:
+# If I put this line in my configure.ac:
# AC_OUTPUT(Makefile src/Makefile tests/Makefile, echo timestamp > stamp-h)dnl
# automake is not happy:
# [ ... ]
@@ -82,7 +82,7 @@ END
mkdir acoutnoq
cd acoutnoq
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_OUTPUT(Makefile, [true])
@@ -104,7 +104,7 @@ cd ..
mkdir acoutpt
cd acoutpt
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_OUTPUT([Makefile], [true])
@@ -128,7 +128,7 @@ cd acoutpt2
# Name of the current "subtest".
cur=acoutput2
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$cur], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([subdir/Makefile subdir/foo Makefile foo], [true])
@@ -160,7 +160,7 @@ cd ..
mkdir acoutqnl
cd acoutqnl
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_OUTPUT([Makefile],
diff --git a/tests/acloca10.test b/tests/acloca10.test
index 7e1570d5c..f00c2eb13 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -26,7 +26,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
MACRO1
MACRO2
diff --git a/tests/acloca11.test b/tests/acloca11.test
index 210da3684..7a1cff609 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -20,7 +20,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
MACRO2
MACRO1
diff --git a/tests/acloca12.test b/tests/acloca12.test
index 07a1b549d..958238e1b 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -21,7 +21,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
MACRO1
END
diff --git a/tests/acloca13.test b/tests/acloca13.test
index 940573d62..e91a534ed 100755
--- a/tests/acloca13.test
+++ b/tests/acloca13.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
m4_include([somefile.m4])
AC_OUTPUT
END
diff --git a/tests/acloca14.test b/tests/acloca14.test
index 3b0b5de86..db20def0a 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_LIBTOOL
AC_OUTPUT
END
@@ -97,7 +97,7 @@ test `ls -1t aclocal.m4 stamp | sed 1q` = aclocal.m4
diff aclocal.m4 stamp
# If FOO where to be used, that would be another story, of course.
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
FOO
EOF
diff --git a/tests/acloca15.test b/tests/acloca15.test
index 988bb0cdb..690c06c67 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure aclocal scans configure.in for macro definitions.
+# Make sure aclocal scans configure.ac for macro definitions.
# PR/319.
am_create_testdir=empty
@@ -23,7 +23,7 @@ am_create_testdir=empty
# Start macros with AM_ because that causes aclocal to complain if it
# cannot find them.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
m4_include([somedef.m4])
AC_DEFUN([AM_SOME_MACRO])
diff --git a/tests/acloca16.test b/tests/acloca16.test
index 03955e83b..ab894c739 100755
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -20,7 +20,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_SUBST([POM])
END
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 49a47a3b5..e6098f0a6 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
SOME_DEFS
END
@@ -36,6 +36,6 @@ EOF
WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep '^configure\.in:2:.*UNDEFINED_MACRO' stderr
+grep '^configure\.ac:2:.*UNDEFINED_MACRO' stderr
:
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 8155882ee..c0510e10d 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_MACRO1
AM_MACRO2
diff --git a/tests/acloca19.test b/tests/acloca19.test
index c00dc560f..60e8afe49 100755
--- a/tests/acloca19.test
+++ b/tests/acloca19.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >configure.in <<'END'
+cat >configure.ac <<'END'
AC_INIT([acloca19], [1.0])
m4_include([aconfig.ac])
FOO
diff --git a/tests/acloca20.test b/tests/acloca20.test
index d2247e46a..030506639 100755
--- a/tests/acloca20.test
+++ b/tests/acloca20.test
@@ -21,7 +21,7 @@ am_create_testdir=empty
echo 'm4_define([FOO], [wrong foo])' > foo.m4
echo 'm4_define([FOO], [right foo])' > acinclude.m4
-echo 'AC_INIT FOO' > configure.in
+echo 'AC_INIT FOO' > configure.ac
chmod a-w foo.m4
diff --git a/tests/acloca21.test b/tests/acloca21.test
index c4ccc5d37..d9b47afc2 100755
--- a/tests/acloca21.test
+++ b/tests/acloca21.test
@@ -22,7 +22,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
dnl m4_include(__some_really_bogus_nonexistent_file__.m4)
# m4_include(__some_really_bogus_nonexistent_file__.m4)
## m4_include(__some_really_bogus_nonexistent_file__.m4)
diff --git a/tests/acloca22.test b/tests/acloca22.test
index 62a15957b..d51c7f104 100755
--- a/tests/acloca22.test
+++ b/tests/acloca22.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
FOO
AC_OUTPUT
EOF
@@ -43,8 +43,8 @@ $MAKE
grep GREPFOO Makefile
grep GREPBAR Makefile && Exit 1
-sed 's/FOO/BAR/' < configure.in > t
-mv -f t configure.in
+sed 's/FOO/BAR/' < configure.ac > t
+mv -f t configure.ac
rm -f foo.m4
$MAKE
grep GREPFOO Makefile && Exit 1
diff --git a/tests/acloca23.test b/tests/acloca23.test
index 633509d73..b5f66e4ce 100755
--- a/tests/acloca23.test
+++ b/tests/acloca23.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
FOO
END
diff --git a/tests/aclocal-acdir.test b/tests/aclocal-acdir.test
index f36ce0e33..f969dcd71 100755
--- a/tests/aclocal-acdir.test
+++ b/tests/aclocal-acdir.test
@@ -22,7 +22,7 @@
mkdir am sys
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
MY_MACRO
END
diff --git a/tests/aclocal-install-absdir.test b/tests/aclocal-install-absdir.test
index a41e8e8e7..353304f6b 100755
--- a/tests/aclocal-install-absdir.test
+++ b/tests/aclocal-install-absdir.test
@@ -23,7 +23,7 @@
mkdir loc sys
-echo 'AM_DUMMY_MACRO' >> configure.in
+echo 'AM_DUMMY_MACRO' >> configure.ac
echo 'AC_DEFUN([AM_DUMMY_MACRO], [:])' >> sys/foo.m4
cwd=`pwd` || fatal_ "cannot get current working directory"
diff --git a/tests/aclocal-path-install-serial.test b/tests/aclocal-path-install-serial.test
index 529f8987b..55d21e26f 100755
--- a/tests/aclocal-path-install-serial.test
+++ b/tests/aclocal-path-install-serial.test
@@ -20,7 +20,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_FOO
END
diff --git a/tests/aclocal-path-install.test b/tests/aclocal-path-install.test
index 34124e6f3..e1c719c7a 100755
--- a/tests/aclocal-path-install.test
+++ b/tests/aclocal-path-install.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_FOO
END
@@ -46,7 +46,7 @@ test ! -f pdir/foo.m4
# The `--install' option should cause a required macro found in a
# directory specified in ACLOCAL_PATH to be installed locally.
-echo AM_BAR >> configure.in
+echo AM_BAR >> configure.ac
$ACLOCAL --install -I ldir
diff pdir/bar.m4 ldir/bar.m4
diff --git a/tests/aclocal-path-nonexistent.test b/tests/aclocal-path-nonexistent.test
index 6065baddf..8c42ddc65 100755
--- a/tests/aclocal-path-nonexistent.test
+++ b/tests/aclocal-path-nonexistent.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_FOO
END
diff --git a/tests/aclocal-path-precedence.test b/tests/aclocal-path-precedence.test
index 178f7c3f8..26ff5f0d6 100755
--- a/tests/aclocal-path-precedence.test
+++ b/tests/aclocal-path-precedence.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([foo], [1.0])
AM_INIT_AUTOMAKE([parallel-tests])
FOO_MACRO
diff --git a/tests/aclocal-path.test b/tests/aclocal-path.test
index e22eea13d..8754c19ee 100755
--- a/tests/aclocal-path.test
+++ b/tests/aclocal-path.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_FOO_MACRO
AM_BAR_MACRO
diff --git a/tests/aclocal.test b/tests/aclocal.test
index 9d7426229..4030b1372 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-echo "AC_INIT([$me], [0]) AM_INIT_AUTOMAKE" > configure.in
+echo "AC_INIT([$me], [0]) AM_INIT_AUTOMAKE" > configure.ac
$ACLOCAL --output=fred
test -f fred
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index 73ee80bd7..b2d2ab967 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_INIT([$me], [1.0])
GNOME_X_CHECKS
END
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index 2e0339f51..bc80f64cd 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_RANLIB
AM_PROG_AR
AC_PROG_CC
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index b823ba798..a6a669ba4 100755
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_TEST([GREPME])
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index 710fbe39d..8923851cd 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
SOME_DEFS
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/aclocal7.test b/tests/aclocal7.test
index 9fa09447b..91be0e67f 100755
--- a/tests/aclocal7.test
+++ b/tests/aclocal7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
SOME_DEFS
AC_CONFIG_FILES([sub/Makefile])
END
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index bb42d80b8..8df0835bc 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
SOME_DEFS
END
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index ab5451b49..c7ce7514e 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
MACRO1
MACRO2
diff --git a/tests/acsilent.test b/tests/acsilent.test
index dc33d34f7..0f9c1cbb0 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >configure.in <<EOF
+cat >configure.ac <<EOF
AC_INIT
AM_INIT_GUILE_MODULE
EOF
diff --git a/tests/acsubst.test b/tests/acsubst.test
index 939631980..9390944c3 100755
--- a/tests/acsubst.test
+++ b/tests/acsubst.test
@@ -16,7 +16,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_SUBST([FOOBAR_LDFLAGS],[blablabla])
END
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
index 8485545c2..e8c866359 100755
--- a/tests/acsubst2.test
+++ b/tests/acsubst2.test
@@ -16,7 +16,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_SUBST([FOOBAR_CFLAGS],[blablabla])
diff --git a/tests/add-missing.tap b/tests/add-missing.tap
index bbb36f8b2..b33600a9a 100755
--- a/tests/add-missing.tap
+++ b/tests/add-missing.tap
@@ -54,7 +54,7 @@ AC_CONFIG_FILES([Makefile])
END
# Pre-compute aclocal.m4, in order to save several aclocal invocations.
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_PROG_CC
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -65,7 +65,7 @@ AM_PATH_PYTHON
END
$ACLOCAL || framework_failure_ "cannot pre-compute aclocal.m4"
-rm -rf configure.in autom4te*.cache
+rm -rf configure.ac autom4te*.cache
mv aclocal.m4 aclocal.stub
# For debugging.
@@ -103,9 +103,9 @@ check_ ()
# might not execute the latter (the Autoconf manual gives more details).
echo > Makefile.am
if test $override = yes; then
- echo > configure.in
+ echo > configure.ac
else
- cp "$ocwd"/configure.stub configure.in
+ cp "$ocwd"/configure.stub configure.ac
fi
test -z "$fetch_file" || cp "$ocwd/$fetch_file" .
# Read description of "test scenario" from standard input.
@@ -114,7 +114,7 @@ check_ ()
case $line in
'== Name ==') what=NAME;;
'== Makefile.am ==') what=Makefile.am;;
- '== configure.in ==') what=configure.in;;
+ '== configure.ac ==') what=configure.ac;;
'== Files ==') what=LIST;;
'==*') framework_failure_ "invalid input line: $line";;
''|'#%'*) : Empty line or ad-hoc comment, ignore. ;;
@@ -143,8 +143,8 @@ check_ ()
fi
echo == Makefile.am ==
cat Makefile.am
- echo == configure.in ==
- cat configure.in
+ echo == configure.ac ==
+ cat configure.ac
echo Expected files: $files
mkdir "$build_aux"
cd ..
@@ -249,7 +249,7 @@ check_ <<'END'
depcomp/C
== Files ==
depcomp
-== configure.in ==
+== configure.ac ==
AC_PROG_CC
== Makefile.am ==
bin_PROGRAMS = foo
@@ -260,7 +260,7 @@ check_ <<'END'
depcomp/C++
== Files ==
depcomp
-== configure.in ==
+== configure.ac ==
AC_PROG_CXX
== Makefile.am ==
bin_PROGRAMS = foo
@@ -272,8 +272,8 @@ check_ --run-aclocal <<'END'
compile
== Files ==
compile
-== configure.in ==
-# Using AM_PROG_CC_C_O in configure.in should be enough. No need to
+== configure.ac ==
+# Using AM_PROG_CC_C_O in configure.ac should be enough. No need to
# use AC_PROG_CC too, nor to define xxx_PROGRAMS in Makefile.am.
AM_PROG_CC_C_O
END
@@ -287,7 +287,7 @@ cfg-$mach
== Files ==
config.sub
config.guess
-== configure.in ==
+== configure.ac ==
AC_CANONICAL_$MACH
END
done
@@ -297,7 +297,7 @@ check_ <<'END'
ylwrap/Lex
== Files ==
ylwrap
-== configure.in ==
+== configure.ac ==
AC_PROG_CC
AC_PROG_LEX
== Makefile.am ==
@@ -311,7 +311,7 @@ check_ <<'END'
ylwrap/Yacc
== Files ==
ylwrap
-== configure.in ==
+== configure.ac ==
AC_PROG_CC
AC_PROG_YACC
== Makefile.am ==
@@ -348,7 +348,7 @@ check_ <<'END'
elisp-comp
== Files ==
elisp-comp
-== configure.in ==
+== configure.ac ==
AM_PATH_LISPDIR
== Makefile.am ==
lisp_LISP = foo.el
@@ -359,7 +359,7 @@ check_ <<'END'
py-compile
== Files ==
py-compile
-== configure.in ==
+== configure.ac ==
AM_PATH_PYTHON
== Makefile.am ==
python_PYTHON = foo.py
@@ -375,7 +375,7 @@ depcomp
ylwrap
config.sub
config.guess
-== configure.in ==
+== configure.ac ==
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_PROG_CXX
diff --git a/tests/alloca.test b/tests/alloca.test
index 2e4e88e22..c87904b3d 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -14,11 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure we complain if @ALLOCA@ is used without being set in configure.in
+# Make sure we complain if @ALLOCA@ is used without being set in configure.ac
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_PROG_AR
AC_PROG_CC
END
diff --git a/tests/alloca2.test b/tests/alloca2.test
index d4c091145..08fad97dd 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -14,11 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure we complain if @LTALLOCA@ is used without being set in configure.in
+# Make sure we complain if @LTALLOCA@ is used without being set in configure.ac
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
END
diff --git a/tests/alpha.test b/tests/alpha.test
index a92239bba..90f2cc267 100755
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -18,7 +18,7 @@
# Jim Meyering.
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([alpha], [1.0a])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/alpha2.test b/tests/alpha2.test
index 104124c56..6d5207f61 100755
--- a/tests/alpha2.test
+++ b/tests/alpha2.test
@@ -15,11 +15,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Another check for README-alpha support. This time it is requested
-# from configure.in. Report from Akim Demaille.
+# from configure.ac. Report from Akim Demaille.
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([alpha], [1.0b])
AM_INIT_AUTOMAKE([readme-alpha])
AC_CONFIG_FILES([Makefile sub/Makefile])
diff --git a/tests/am-tests-environment.test b/tests/am-tests-environment.test
index 0a2c9a6ef..3a6e75532 100755
--- a/tests/am-tests-environment.test
+++ b/tests/am-tests-environment.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_MKDIR_P
AC_OUTPUT
END
diff --git a/tests/amassign.test b/tests/amassign.test
index f2245c93c..1649dd080 100755
--- a/tests/amassign.test
+++ b/tests/amassign.test
@@ -14,12 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to see if AM_ name can be assigned to in configure.in.
+# Test to see if AM_ name can be assigned to in configure.ac.
# Report from Steve Robbins.
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CFLAGS=foo
AC_SUBST(AM_BAR)
AC_SUBST([AM_ZARDOZ])
diff --git a/tests/ammissing.test b/tests/ammissing.test
index d13f07179..aa281267c 100755
--- a/tests/ammissing.test
+++ b/tests/ammissing.test
@@ -18,8 +18,8 @@
. ./defs || Exit 1
-echo AM_ZARDOZ >> configure.in
+echo AM_ZARDOZ >> configure.ac
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr
-grep 'configure.in:.*AM_ZARDOZ.*not found' stderr
+grep 'configure.ac:.*AM_ZARDOZ.*not found' stderr
diff --git a/tests/amopt.test b/tests/amopt.test
index cd3baf159..786118410 100755
--- a/tests/amopt.test
+++ b/tests/amopt.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_CONDITIONAL([COND], [true])
END
diff --git a/tests/amopts-location.test b/tests/amopts-location.test
index 27f9ae025..0219f1854 100755
--- a/tests/amopts-location.test
+++ b/tests/amopts-location.test
@@ -54,7 +54,7 @@ AUTOMAKE_OPTIONS += tar-v7
zardoz = 1
END
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_FILES([Makefile2 Makefile3])
END
diff --git a/tests/amopts-variable-expansion.test b/tests/amopts-variable-expansion.test
index 1a542b878..981759c15 100755
--- a/tests/amopts-variable-expansion.test
+++ b/tests/amopts-variable-expansion.test
@@ -21,7 +21,7 @@
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/amsubst.test b/tests/amsubst.test
index b7d9a7ee6..b655ce472 100755
--- a/tests/amsubst.test
+++ b/tests/amsubst.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([backslash], "\\")
_AM_SUBST_NOTMAKE([backslash])
AC_OUTPUT
diff --git a/tests/ansi2knr-no-more.test b/tests/ansi2knr-no-more.test
index bca00ec30..fb2e2a546 100755
--- a/tests/ansi2knr-no-more.test
+++ b/tests/ansi2knr-no-more.test
@@ -21,36 +21,36 @@
warn_rx='automatic de-ANSI-fication.*removed'
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
$ACLOCAL
mv aclocal.m4 aclocal.sav
-cp configure.in configure.sav
+cp configure.ac configure.sav
-echo AM_C_PROTOTYPES >> configure.in
+echo AM_C_PROTOTYPES >> configure.ac
$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep "^configure\\.in:5:.*$warn_rx" stderr
+grep "^configure\\.ac:5:.*$warn_rx" stderr
cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep "^configure\\.in:5:.*$warn_rx" stderr
+grep "^configure\\.ac:5:.*$warn_rx" stderr
for opt in ansi2knr lib/ansi2knr; do
# ansi2knr option in Makefile.am
- cp configure.sav configure.in
+ cp configure.sav configure.ac
echo "AUTOMAKE_OPTIONS = $opt" > Makefile.am
rm -rf autom4te*.cache
AUTOMAKE_fails -Wnone
grep "^Makefile\.am:1:.*$warn_rx" stderr
- # ansi2knr option in configure.in
+ # ansi2knr option in configure.ac
echo > Makefile.am # `echo', not `:', for Solaris /bin/sh.
- sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.in
- cat configure.in # For debugging.
+ sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.ac
+ cat configure.ac # For debugging.
rm -rf autom4te*.cache
AUTOMAKE_fails -Wnone
- grep "^configure\.in:2:.*$warn_rx" stderr
+ grep "^configure\\.ac:2:.*$warn_rx" stderr
done
:
diff --git a/tests/ar-lib2.test b/tests/ar-lib2.test
index 94ab4acbd..7d7e9b588 100755
--- a/tests/ar-lib2.test
+++ b/tests/ar-lib2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
END
@@ -32,7 +32,7 @@ $ACLOCAL
$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
# Make sure ar-lib is installed, and that Automake says so.
-grep '^configure\.in:.*install.*ar-lib' stderr
+grep '^configure\.ac:.*install.*ar-lib' stderr
test -f ar-lib
:
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
index f725c7e55..02696f62d 100755
--- a/tests/ar-lib3.test
+++ b/tests/ar-lib3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
END
@@ -33,7 +33,7 @@ AUTOMAKE_fails
grep 'requires.*AM_PROG_AR' stderr
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
END
diff --git a/tests/ar-lib4.test b/tests/ar-lib4.test
index 19ffd4cf1..d1be2eb41 100755
--- a/tests/ar-lib4.test
+++ b/tests/ar-lib4.test
@@ -19,9 +19,9 @@
required=libtoolize
. ./defs || Exit 1
-cp configure.in X
+cp configure.ac X
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LIBTOOL
@@ -39,9 +39,9 @@ AUTOMAKE_fails
grep 'requires.*AM_PROG_AR' stderr
-cp X configure.in
+cp X configure.ac
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/ar-lib5a.test b/tests/ar-lib5a.test
index 4f9ffea39..89dc6d659 100755
--- a/tests/ar-lib5a.test
+++ b/tests/ar-lib5a.test
@@ -21,7 +21,7 @@
required=lib
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
AM_INIT_AUTOMAKE
diff --git a/tests/ar-lib5b.test b/tests/ar-lib5b.test
index c9b366820..b99d195cd 100755
--- a/tests/ar-lib5b.test
+++ b/tests/ar-lib5b.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
AM_INIT_AUTOMAKE
diff --git a/tests/ar-lib6a.test b/tests/ar-lib6a.test
index 328677b86..66ae15b98 100755
--- a/tests/ar-lib6a.test
+++ b/tests/ar-lib6a.test
@@ -20,7 +20,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
diff --git a/tests/ar-lib6b.test b/tests/ar-lib6b.test
index 79acf4542..2be728f15 100755
--- a/tests/ar-lib6b.test
+++ b/tests/ar-lib6b.test
@@ -20,7 +20,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LIBTOOL
diff --git a/tests/ar-lib7.test b/tests/ar-lib7.test
index cc43546cb..34e6c6e53 100755
--- a/tests/ar-lib7.test
+++ b/tests/ar-lib7.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
END
@@ -27,7 +27,7 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep '^configure\.in:.*ar-lib.*not found' stderr
+grep '^configure\.ac:.*ar-lib.*not found' stderr
$AUTOMAKE --add-missing
diff --git a/tests/ar.test b/tests/ar.test
index 9deba9358..b8d9901a0 100755
--- a/tests/ar.test
+++ b/tests/ar.test
@@ -14,11 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.in.
+# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.ac.
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
AC_SUBST([AR], ['echo it works'])
AC_SUBST([ARFLAGS], ['>'])
diff --git a/tests/ar2.test b/tests/ar2.test
index b7888815a..c71afea09 100755
--- a/tests/ar2.test
+++ b/tests/ar2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_OUTPUT
diff --git a/tests/ar3.test b/tests/ar3.test
index 4e4f4563f..ba0b4b737 100755
--- a/tests/ar3.test
+++ b/tests/ar3.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/ar4.test b/tests/ar4.test
index 3081449ee..424a77675 100755
--- a/tests/ar4.test
+++ b/tests/ar4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
END
diff --git a/tests/ar5.test b/tests/ar5.test
index 572b671dc..711fad6a1 100755
--- a/tests/ar5.test
+++ b/tests/ar5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR([
echo spy > bad-archiver-interface-detected
AC_MSG_CHECKING([for something else])
diff --git a/tests/asm.test b/tests/asm.test
index fbd3379bc..f71f6220f 100755
--- a/tests/asm.test
+++ b/tests/asm.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-mv configure.in configure.stub
+mv configure.ac configure.stub
cat > Makefile.am << 'END'
noinst_PROGRAMS = maude
@@ -27,7 +27,7 @@ maude_SOURCES = maude.s
END
echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_SUBST([CCASFLAGS])
AC_OUTPUT
END
@@ -38,15 +38,15 @@ grep '[Aa]ssembler source.*CCAS.* undefined' stderr
grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
# used. We could do `$sleep', but it's faster to erase the
# directory. (Erase autom4te*.cache, not autom4te.cache, because some
# bogus installations of Autoconf use a versioned cache.)
rm -rf autom4te*.cache
echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_PROG_CC
AC_SUBST([CCASFLAGS])
AC_OUTPUT
@@ -60,7 +60,7 @@ grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -75,7 +75,7 @@ grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 4 -- we have everything needed, expect success ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -89,7 +89,7 @@ $AUTOMAKE
rm -rf autom4te*.cache
echo '*** Try 5 -- we have everything needed, expect success ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AM_PROG_AS
AC_OUTPUT
END
diff --git a/tests/asm2.test b/tests/asm2.test
index c607b7d4e..8194f4f68 100755
--- a/tests/asm2.test
+++ b/tests/asm2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-mv configure.in configure.stub
+mv configure.ac configure.stub
cat > Makefile.am << 'END'
noinst_PROGRAMS = maude
@@ -27,7 +27,7 @@ maude_SOURCES = maude.S
END
echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_SUBST([CCASFLAGS])
AC_OUTPUT
END
@@ -38,15 +38,15 @@ grep '[Aa]ssembler source.*CCAS.* undefined' stderr
grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
# used. We could do `$sleep', but it's faster to erase the
# directory. (Erase autom4te*.cache, not autom4te.cache, because some
# bogus installations of Autoconf use a versioned cache.)
rm -rf autom4te*.cache
echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_PROG_CC
AC_SUBST([CCASFLAGS])
AC_OUTPUT
@@ -60,7 +60,7 @@ grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -75,7 +75,7 @@ grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 4 -- we need dependency tracking. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -90,7 +90,7 @@ grep ' add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 5 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -105,7 +105,7 @@ $AUTOMAKE
rm -rf autom4te*.cache
echo '*** Try 6 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AM_PROG_AS
AC_OUTPUT
END
diff --git a/tests/asm3.test b/tests/asm3.test
index e74a10cf1..2207f9b7c 100755
--- a/tests/asm3.test
+++ b/tests/asm3.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-mv configure.in configure.stub
+mv configure.ac configure.stub
cat > Makefile.am << 'END'
noinst_PROGRAMS = maude
@@ -27,7 +27,7 @@ maude_SOURCES = maude.sx
END
echo '*** Try 1 -- should fail because we need CC and CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_SUBST([CCASFLAGS])
AC_OUTPUT
END
@@ -38,15 +38,15 @@ grep '[Aa]ssembler source.*CCAS.* undefined' stderr
grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
# used. We could do `$sleep', but it's faster to erase the
# directory. (Erase autom4te*.cache, not autom4te.cache, because some
# bogus installations of Autoconf use a versioned cache.)
rm -rf autom4te*.cache
echo '*** Try 2 -- we still need CCAS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AC_PROG_CC
AC_SUBST([CCASFLAGS])
AC_OUTPUT
@@ -60,7 +60,7 @@ grep 'define .*CCAS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 3 -- we need CCASFLAGS ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -75,7 +75,7 @@ grep 'define .*CCASFLAGS.* add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 4 -- we need dependency tracking. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -90,7 +90,7 @@ grep ' add .*AM_PROG_AS' stderr
rm -rf autom4te*.cache
echo '*** Try 5 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
CCAS='$(CC)'
AC_SUBST([CCAS])
AC_PROG_CC
@@ -105,7 +105,7 @@ $AUTOMAKE
rm -rf autom4te*.cache
echo '*** Try 6 -- we have everything needed, expect success. ***'
-cat configure.stub - > configure.in << 'END'
+cat configure.stub - > configure.ac << 'END'
AM_PROG_AS
AC_OUTPUT
END
diff --git a/tests/autodist-acconfig-no-subdir.test b/tests/autodist-acconfig-no-subdir.test
index d12120a44..26aabe009 100755
--- a/tests/autodist-acconfig-no-subdir.test
+++ b/tests/autodist-acconfig-no-subdir.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/autodist-acconfig.test b/tests/autodist-acconfig.test
index f3c388e87..3745ada74 100755
--- a/tests/autodist-acconfig.test
+++ b/tests/autodist-acconfig.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/autodist-aclocal-m4.test b/tests/autodist-aclocal-m4.test
index 1db4e79f8..73d0a9ab4 100755
--- a/tests/autodist-aclocal-m4.test
+++ b/tests/autodist-aclocal-m4.test
@@ -24,10 +24,10 @@
. ./defs || Exit 1
{ echo 'm4_include([defs.m4])'
- cat configure.in
+ cat configure.ac
echo 'AC_OUTPUT'
} > t
-mv -f t configure.in
+mv -f t configure.ac
cat > Makefile.am <<'END'
.PHONY: test
diff --git a/tests/autodist-config-headers.test b/tests/autodist-config-headers.test
index 5a194f526..65888f813 100755
--- a/tests/autodist-config-headers.test
+++ b/tests/autodist-config-headers.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_CONFIG_HEADERS([config.h sub/config.h cfg2.h:conf2.hin])
AC_OUTPUT
END
diff --git a/tests/autodist-configure-no-subdir.test b/tests/autodist-configure-no-subdir.test
index 7435d2ff3..7913d902d 100755
--- a/tests/autodist-configure-no-subdir.test
+++ b/tests/autodist-configure-no-subdir.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/autodist-stamp-vti.test b/tests/autodist-stamp-vti.test
index be4bf17bd..2345ad66b 100755
--- a/tests/autodist-stamp-vti.test
+++ b/tests/autodist-stamp-vti.test
@@ -21,7 +21,7 @@
required=makeinfo
. ./defs || Exit 1
-cat >> configure.in << END
+cat >> configure.ac << END
AC_OUTPUT
END
diff --git a/tests/autodist-subdir.test b/tests/autodist-subdir.test
index a605654e2..cda2d50b2 100755
--- a/tests/autodist-subdir.test
+++ b/tests/autodist-subdir.test
@@ -26,7 +26,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/autodist.test b/tests/autodist.test
index 099af9d9f..2c6c3227c 100755
--- a/tests/autodist.test
+++ b/tests/autodist.test
@@ -22,7 +22,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
diff --git a/tests/autohdr.test b/tests/autohdr.test
index c5031cc1d..bef7027fe 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_CONFIG_HEADERS([thisfile.h])
EOF
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 1534a3e4b..6f5415e00 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_CONFIG_HEADER([thisfile.h])
EOF
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index 8eb0d9f46..ad5513059 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
m4_include([foo.m4])
AC_CONFIG_HEADERS([config.h:config.hin])
AC_OUTPUT
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index 7c002bd54..9acbab135 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_PROG_CC
AC_SUBST([BOT], [bot])
AC_CONFIG_HEADERS([defs.h config.h:sub1/config.top:sub2/config.${BOT}],,
diff --git a/tests/autohdrdry.test b/tests/autohdrdry.test
index cf402a65c..e7e849d17 100755
--- a/tests/autohdrdry.test
+++ b/tests/autohdrdry.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_CONFIG_HEADERS([config.h])
AC_OUTPUT
EOF
diff --git a/tests/auxdir-autodetect.test b/tests/auxdir-autodetect.test
index 0ef12d726..6e701ff41 100755
--- a/tests/auxdir-autodetect.test
+++ b/tests/auxdir-autodetect.test
@@ -23,7 +23,7 @@ nil=__no_such_program
unset NONESUCH || :
-cat >>configure.in << END
+cat >>configure.ac << END
AM_MISSING_PROG([NONESUCH],[$nil])
AC_OUTPUT
END
@@ -42,7 +42,7 @@ chmod +x d3/d2/d1/missing
echo 'echo %%d0%% $*' > d3/d2/d1/d0/missing
chmod +x d3/d2/d1/d0/missing
-mv configure.in d3/d2/d1/d0/
+mv configure.ac d3/d2/d1/d0/
cd d3/d2/d1/d0
diff --git a/tests/auxdir-computed.tap b/tests/auxdir-computed.tap
index 4c73a6938..487958df7 100755
--- a/tests/auxdir-computed.tap
+++ b/tests/auxdir-computed.tap
@@ -21,7 +21,7 @@
plan_ 3
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([\$foo])
AM_INIT_AUTOMAKE
diff --git a/tests/auxdir-misplaced.test b/tests/auxdir-misplaced.test
index 962ab330d..33f5db061 100755
--- a/tests/auxdir-misplaced.test
+++ b/tests/auxdir-misplaced.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_AUX_DIR([.]) dnl this will appear after AM_INIT_AUTOMAKE
END
diff --git a/tests/auxdir-nonexistent.test b/tests/auxdir-nonexistent.test
index 3dd647738..5575b284d 100755
--- a/tests/auxdir-nonexistent.test
+++ b/tests/auxdir-nonexistent.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([nonesuch])
AM_INIT_AUTOMAKE
@@ -29,6 +29,6 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep '^configure\.in:2:.*nonesuch.* not exist' stderr
+grep '^configure\.ac:2:.*nonesuch.* not exist' stderr
:
diff --git a/tests/auxdir-unportable.tap b/tests/auxdir-unportable.tap
index fb4fecafd..d04b38c89 100755
--- a/tests/auxdir-unportable.tap
+++ b/tests/auxdir-unportable.tap
@@ -20,7 +20,7 @@
plan_ 4
-cat >configure.in <<END
+cat >configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([aux])
AM_INIT_AUTOMAKE
@@ -35,7 +35,7 @@ am_warn_unportable_auxdir ()
AUTOMAKE_fails
command_ok_ \
"warn about $details unportable auxdir name" \
- grep '^configure\.in:2:.*aux.*W32' stderr
+ grep '^configure\.ac:2:.*aux.*W32' stderr
}
$ACLOCAL || fatal_ "aclocal failed"
diff --git a/tests/auxdir.test b/tests/auxdir.test
index c09b9e43b..c4860f4d2 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
# The "./." is here so we don't have to mess with subdirs.
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([./.])
AM_INIT_AUTOMAKE
diff --git a/tests/auxdir6.test b/tests/auxdir6.test
index 04881da06..08de2415a 100755
--- a/tests/auxdir6.test
+++ b/tests/auxdir6.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
AM_INIT_AUTOMAKE
diff --git a/tests/auxdir7.test b/tests/auxdir7.test
index 9a8343295..82d3e659a 100755
--- a/tests/auxdir7.test
+++ b/tests/auxdir7.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
diff --git a/tests/auxdir8.test b/tests/auxdir8.test
index dc2ee28bf..cbc98949a 100755
--- a/tests/auxdir8.test
+++ b/tests/auxdir8.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
END
diff --git a/tests/backcompat2.test b/tests/backcompat2.test
index 26f4ffa4b..ee38e51d7 100755
--- a/tests/backcompat2.test
+++ b/tests/backcompat2.test
@@ -18,6 +18,7 @@
# three arguments does AC_DEFINE the symbols PACKAGE and VERSION iff the
# third argument is empty or non-existent.
+am_create_testdir=empty
. ./defs || Exit 1
# A trick to make the test run muuuch faster, by avoiding repeated
@@ -26,6 +27,8 @@ echo 'AC_INIT(x,0) AM_INIT_AUTOMAKE' > configure.in
$ACLOCAL
rm -rf configure.in autom4te.*
+touch install-sh missing
+
cat > config.h.in <<'END'
#undef PACKAGE
#undef VERSION
diff --git a/tests/backcompat3.test b/tests/backcompat3.test
index 5571dd3aa..f90b8f01e 100755
--- a/tests/backcompat3.test
+++ b/tests/backcompat3.test
@@ -17,6 +17,7 @@
# Backward-compatibility test: check what happens when AC_INIT and
# AM_INIT_AUTOMAKE are both given two or more arguments.
+am_create_testdir=empty
. ./defs || Exit 1
empty=''
@@ -50,7 +51,7 @@ cat configure.in
$ACLOCAL
$AUTOCONF
-$AUTOMAKE
+$AUTOMAKE -a
./configure
diff --git a/tests/backcompat4.test b/tests/backcompat4.test
index 44c3c9487..9088aae1f 100755
--- a/tests/backcompat4.test
+++ b/tests/backcompat4.test
@@ -40,23 +40,23 @@ for args in \
'foo:foo1.in:foo2.in:sub/bar.in:foo3.in' \
; do
rm -rf autom4te*.cache aclocal.m4
- unindent >configure.in <<END
+ unindent >configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([$args])
AC_OUTPUT
END
- cat configure.in # For debugging.
+ cat configure.ac # For debugging.
$ACLOCAL
$AUTOMAKE Makefile
mv -f Makefile.in Makefile.acf
rm -rf autom4te*.cache aclocal.m4
- unindent >configure.in <<END
+ unindent >configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([$args])
END
- cat configure.in # For debugging.
+ cat configure.ac # For debugging.
$ACLOCAL
$AUTOMAKE Makefile
mv -f Makefile.in Makefile.aco
diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index d1b316cf4..262a6c70c 100755
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -20,15 +20,18 @@
# See also the similar test `backcompat6.test'.
am_parallel_tests=no
+am_create_testdir=empty
. ./defs || Exit 1
+makefiles='hacky/Makefile src/Makefile data/Makefile tests/Makefile'
+
# Yuck!
-cat > configure.in <<'END'
+cat > configure.in <<END
dnl: Everything here is *deliberately* underquoted!
AC_INIT(src/foo.input)
AM_INIT_AUTOMAKE(foo, 1.0)
AC_CONFIG_FILES(Makefile:mkfile.in)
-AC_OUTPUT(hacky/Makefile src/Makefile data/Makefile tests/Makefile)
+AC_OUTPUT($makefiles)
END
distdir=foo-1.0
@@ -91,7 +94,11 @@ END
$ACLOCAL
$AUTOCONF
+$AUTOMAKE -a
+test -f install-sh
+for f in $makefiles; do mv -f $f.in $f.sav; done
$AUTOMAKE
+for f in $makefiles; do diff $f.sav $f.in; done
./configure
ls -l . hacky src data tests # For debugging.
diff --git a/tests/backcompat6.test b/tests/backcompat6.test
index 60cbcaf80..7d70b743c 100755
--- a/tests/backcompat6.test
+++ b/tests/backcompat6.test
@@ -20,6 +20,7 @@
# See also the similar test `backcompat5.test'.
required=cc
+am_create_testdir=empty
. ./defs || Exit 1
# Anyone doing something like this in a real-life package probably
@@ -77,7 +78,7 @@ int main (void)
END
$ACLOCAL
-$AUTOMAKE
+$AUTOMAKE --add-missing
$AUTOCONF
./configure
diff --git a/tests/backsl.test b/tests/backsl.test
index 931691507..48d70c719 100755
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/backsl4.test b/tests/backsl4.test
index b51ffe354..c11d20d47 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
# Note: trailing whitespace used during the test should not appear as
# trailing whitespace in this file, or it will get stripped by any
diff --git a/tests/badline.test b/tests/badline.test
index f9cb0e880..3f548f75d 100755
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_SUBST(TEXINFOS)
@@ -30,4 +30,4 @@ END
$ACLOCAL || Exit 1
AUTOMAKE_fails
-grep 'configure.in:3:.*info_TEXINFOS' stderr
+grep 'configure.ac:3:.*info_TEXINFOS' stderr
diff --git a/tests/badprog.test b/tests/badprog.test
index 907976b24..81ff5b76c 100755
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/candist.test b/tests/candist.test
index 8f8c52e99..88d8854fd 100755
--- a/tests/candist.test
+++ b/tests/candist.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
cat > Makefile.am << 'END'
dist_bin_PROGRAMS = foo
diff --git a/tests/canon-name.test b/tests/canon-name.test
index 9d46acd57..bc65b8924 100755
--- a/tests/canon-name.test
+++ b/tests/canon-name.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([./gmakefile ./sub/gmakefile])
diff --git a/tests/canon.test b/tests/canon.test
index 48d3de110..b5038a535 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/canon3.test b/tests/canon3.test
index 078e79db1..25a8e71df 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/canon4.test b/tests/canon4.test
index 8a330006c..8ff2404fb 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/canon5.test b/tests/canon5.test
index 15a8bd0df..0d71d8328 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/canon6.test b/tests/canon6.test
index aef4c186e..23064491f 100755
--- a/tests/canon6.test
+++ b/tests/canon6.test
@@ -20,7 +20,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/canon7.test b/tests/canon7.test
index 997caf3d4..d9d22c218 100755
--- a/tests/canon7.test
+++ b/tests/canon7.test
@@ -19,7 +19,7 @@
required='cc libtool libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB dnl: for static libraries
diff --git a/tests/canon8.test b/tests/canon8.test
index bdb35e0bc..5ec372eb7 100755
--- a/tests/canon8.test
+++ b/tests/canon8.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/ccnoco.test b/tests/ccnoco.test
index d956f5074..910bb121a 100755
--- a/tests/ccnoco.test
+++ b/tests/ccnoco.test
@@ -20,7 +20,7 @@
required=gcc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+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.
diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test
index c7d6875f3..e6c9c6428 100755
--- a/tests/ccnoco2.test
+++ b/tests/ccnoco2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AC_OUTPUT
EOF
diff --git a/tests/ccnoco3.test b/tests/ccnoco3.test
index d667a9802..aea56cb4f 100755
--- a/tests/ccnoco3.test
+++ b/tests/ccnoco3.test
@@ -19,7 +19,7 @@
required=gcc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
$CC --version; $CC -v; # For debugging.
diff --git a/tests/check-concurrency-bug9245.test b/tests/check-concurrency-bug9245.test
index 8d53ac05c..a1b61acc2 100755
--- a/tests/check-concurrency-bug9245.test
+++ b/tests/check-concurrency-bug9245.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
index b074f53ab..b1e6b7025 100755
--- a/tests/check-exported-srcdir.test
+++ b/tests/check-exported-srcdir.test
@@ -35,7 +35,7 @@ mv [!S]* SrcDir
mkdir BuildDir
cd SrcDir
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check-fd-redirect.test b/tests/check-fd-redirect.test
index 635330126..5a64c229a 100755
--- a/tests/check-fd-redirect.test
+++ b/tests/check-fd-redirect.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check-subst-prog.test b/tests/check-subst-prog.test
index 8d8ff586b..6fadc7f22 100755
--- a/tests/check-subst-prog.test
+++ b/tests/check-subst-prog.test
@@ -20,7 +20,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_SUBST([script_tests],
['subst-pass-script.test subst-xfail-script.test'])
diff --git a/tests/check-subst.test b/tests/check-subst.test
index 03aa07ad0..49702b699 100755
--- a/tests/check-subst.test
+++ b/tests/check-subst.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([script_tests], ['subst-pass-script.sh subst-xfail-script.sh'])
AC_SUBST([xfail_tests], ['xfail-script.test subst-xfail-script.sh'])
AC_OUTPUT
diff --git a/tests/check-tests-in-builddir.test b/tests/check-tests-in-builddir.test
index 93dd96639..9f1fe4a6b 100755
--- a/tests/check-tests-in-builddir.test
+++ b/tests/check-tests-in-builddir.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check10.test b/tests/check10.test
index 3726e1c7a..3b3ee8bdf 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -20,7 +20,7 @@
am_parallel_tests=no
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check11.test b/tests/check11.test
index 401932455..e78da0f16 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check12.test b/tests/check12.test
index 1afa95982..b611f4cd3 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -20,7 +20,7 @@
required=runtest
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check2.test b/tests/check2.test
index 7dbb4c0ae..8a05c9cc8 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
AC_OUTPUT
END
diff --git a/tests/check3.test b/tests/check3.test
index 83520ba8e..0c90af946 100755
--- a/tests/check3.test
+++ b/tests/check3.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
AC_OUTPUT
END
diff --git a/tests/check4.test b/tests/check4.test
index ca4666444..4f8512a3f 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
AC_OUTPUT
END
diff --git a/tests/check5.test b/tests/check5.test
index 7b412ae96..31790f8af 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -19,7 +19,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/check6.test b/tests/check6.test
index 4968f2498..b6f6a670b 100755
--- a/tests/check6.test
+++ b/tests/check6.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/check7.test b/tests/check7.test
index d3e5b7e0d..574569b90 100755
--- a/tests/check7.test
+++ b/tests/check7.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/check8.test b/tests/check8.test
index 54f55ff71..bf285e6a7 100755
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -19,7 +19,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/clean2.test b/tests/clean2.test
index a74d2c5f0..2599e97cb 100755
--- a/tests/clean2.test
+++ b/tests/clean2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
diff --git a/tests/colneq2.test b/tests/colneq2.test
index 515c2f593..b313441af 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/colneq3.test b/tests/colneq3.test
index 42bfcb9a6..728cc3299 100755
--- a/tests/colneq3.test
+++ b/tests/colneq3.test
@@ -19,7 +19,7 @@
required=GNUmake
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/colon.test b/tests/colon.test
index 5c63bcd5d..f5cb4e0f3 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([foo.h:foo.hin])
AC_OUTPUT
END
diff --git a/tests/colon2.test b/tests/colon2.test
index 7823cbed4..b1938dc3d 100755
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile:zardoz.in])
diff --git a/tests/colon3.test b/tests/colon3.test
index f8c118805..7b7f83e4f 100755
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile:zardoz.in:two.in:three.in])
diff --git a/tests/colon4.test b/tests/colon4.test
index 9043616f3..6dad3ab85 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_CONFIG_FILES([zardoz:one:two:three])
AC_OUTPUT
END
diff --git a/tests/colon5.test b/tests/colon5.test
index 7f51db179..5a0ef379b 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile:Makefile.in:Makefile.dep])
diff --git a/tests/colon6.test b/tests/colon6.test
index 295f91257..9f14d2a09 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
# With this, version.good should depend on version.gin, while
diff --git a/tests/colon7.test b/tests/colon7.test
index f7ba0d121..822ef9dae 100755
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([colon7], [1.0])
AM_INIT_AUTOMAKE
dnl: Please do not add proper m4 quoting here.
diff --git a/tests/color.test b/tests/color.test
index 26a94fa8c..ed6a72747 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -39,7 +39,7 @@ case `echo "$std" | grep .` in
*) skip_ "grep can't parse nonprinting characters";;
esac
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/color2.test b/tests/color2.test
index 6e9efbdf0..7df18243f 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -69,7 +69,7 @@ rm -f expect-check Makefile
# Do the tests.
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/comment2.test b/tests/comment2.test
index 199e0283b..a63075c92 100755
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/comment4.test b/tests/comment4.test
index d294e0b0b..42e7bf9ad 100755
--- a/tests/comment4.test
+++ b/tests/comment4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/comment5.test b/tests/comment5.test
index db9b75a75..0c2a4d601 100755
--- a/tests/comment5.test
+++ b/tests/comment5.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/comment6.test b/tests/comment6.test
index 0d263b563..9fd8d1069 100755
--- a/tests/comment6.test
+++ b/tests/comment6.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/comment7.test b/tests/comment7.test
index c080a002d..5637fb7b6 100755
--- a/tests/comment7.test
+++ b/tests/comment7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AM_CONDITIONAL([COND], [true])
EOF
diff --git a/tests/comment8.test b/tests/comment8.test
index 1a2b71b59..3ed31e7c7 100755
--- a/tests/comment8.test
+++ b/tests/comment8.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
AC_OUTPUT
diff --git a/tests/comments-in-var-def.test b/tests/comments-in-var-def.test
index c5d573f7a..5c01d76c1 100755
--- a/tests/comments-in-var-def.test
+++ b/tests/comments-in-var-def.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/compile4.test b/tests/compile4.test
index 9411e1ed2..d7ae6505d 100755
--- a/tests/compile4.test
+++ b/tests/compile4.test
@@ -45,7 +45,7 @@ absfoodir=`pwd`/sub
absmainc=`pwd`/main.c
absmainobj=`pwd`/main.obj
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_AR
diff --git a/tests/compile5.test b/tests/compile5.test
index ffaad179e..fe74f5fa1 100755
--- a/tests/compile5.test
+++ b/tests/compile5.test
@@ -29,7 +29,7 @@ END
chmod +x ./cl
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AC_CANONICAL_HOST
AC_CONFIG_FILES([check_host], [chmod +x check_host])
AC_OUTPUT
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index cce7fb4d4..806c59f92 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_FC
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index 303780b59..99893d8c3 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
diff --git a/tests/cond-basic.test b/tests/cond-basic.test
index e2719a1fb..5d18b5c5f 100755
--- a/tests/cond-basic.test
+++ b/tests/cond-basic.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
AC_OUTPUT
END
diff --git a/tests/cond.test b/tests/cond.test
index a137d7278..f7f0a8c1a 100755
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
AC_OUTPUT
END
diff --git a/tests/cond10.test b/tests/cond10.test
index 77ab9527a..56a9083cd 100755
--- a/tests/cond10.test
+++ b/tests/cond10.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([USE_A], [test x = y])
AM_CONDITIONAL([USE_B], [test x = z])
diff --git a/tests/cond11.test b/tests/cond11.test
index fa3a1b675..b53cb70e9 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
AM_CONDITIONAL([USE_A], [test -z "$two"])
AC_SUBST([SUBSTVAR], [bar])
diff --git a/tests/cond13.test b/tests/cond13.test
index 8fd048761..1ab328d7b 100755
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AM_PROG_AR
diff --git a/tests/cond14.test b/tests/cond14.test
index 0bb2e7b18..f3725c3af 100755
--- a/tests/cond14.test
+++ b/tests/cond14.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([COND1], [true])
END
diff --git a/tests/cond15.test b/tests/cond15.test
index 5bcf700a5..68f70fd47 100755
--- a/tests/cond15.test
+++ b/tests/cond15.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
diff --git a/tests/cond16.test b/tests/cond16.test
index d258cebee..11a4f68d2 100755
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
AC_OUTPUT
END
diff --git a/tests/cond17.test b/tests/cond17.test
index d4669299c..37a0793ba 100755
--- a/tests/cond17.test
+++ b/tests/cond17.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AM_CONDITIONAL([COND1], [true])
diff --git a/tests/cond18.test b/tests/cond18.test
index 7c2f1ce47..32c0ab2b9 100755
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
AC_OUTPUT
diff --git a/tests/cond19.test b/tests/cond19.test
index 973aa34a1..86f677e6f 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
AC_SUBST([OBJEXT], [o])
AM_CONDITIONAL([COND1], [test "x$CONDITION1" = "xtrue"])
diff --git a/tests/cond2.test b/tests/cond2.test
index 08764001c..1b5fceaee 100755
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
END
diff --git a/tests/cond20.test b/tests/cond20.test
index fa26248aa..40e41f1fe 100755
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([COND1], [true])
END
diff --git a/tests/cond21.test b/tests/cond21.test
index fa29111a2..7719c835d 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
AM_CONDITIONAL([COND3], [true])
diff --git a/tests/cond22.test b/tests/cond22.test
index cb7cbec35..7a58c2418 100755
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
CC=false; AC_SUBST([CC])
OBJEXT=oo; AC_SUBST([OBJEXT])
AM_CONDITIONAL([ONE], [true])
diff --git a/tests/cond23.test b/tests/cond23.test
index a66c801e3..d6c2bdfe3 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_CONDITIONAL([COND], [true])
AC_OUTPUT
EOF
diff --git a/tests/cond24.test b/tests/cond24.test
index fd57d416c..b7038cc6b 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_SUBST([foo], [bar])
AM_CONDITIONAL([COND], [true])
EOF
@@ -34,6 +34,6 @@ EOF
$ACLOCAL
AUTOMAKE_fails
grep '^Makefile\.am:3:.* foo was already defined' stderr
-grep '^configure\.in:4:.*foo.* previously defined here' stderr
+grep '^configure\.ac:4:.*foo.* previously defined here' stderr
:
diff --git a/tests/cond25.test b/tests/cond25.test
index 5f53a0169..c42703356 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
AC_PROG_CC
EOF
diff --git a/tests/cond26.test b/tests/cond26.test
index 90fbcffbf..f0aac9638 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
EOF
diff --git a/tests/cond27.test b/tests/cond27.test
index 3c0c5c75a..0a8263d01 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
EOF
diff --git a/tests/cond28.test b/tests/cond28.test
index b123ff513..7a6bcff84 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
EOF
diff --git a/tests/cond29.test b/tests/cond29.test
index 61d9af57c..ee9bf9b76 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >>configure.in
+echo AC_PROG_CC >>configure.ac
cat >Makefile.am <<EOF
bin_PROGRAMS = a
@@ -54,7 +54,7 @@ do
a04_SOURCES = quux${i}.c
endif C$i
EOF
- echo "AM_CONDITIONAL([C$i], [:])" >>configure.in
+ echo "AM_CONDITIONAL([C$i], [:])" >>configure.ac
done
$ACLOCAL
diff --git a/tests/cond3.test b/tests/cond3.test
index 64d1a2a67..cf334a5d8 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([ONE], [true])
AM_CONDITIONAL([TWO], [false])
diff --git a/tests/cond30.test b/tests/cond30.test
index ebec0c0e7..6c2b39626 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([C1], [test -z "$two"])
AM_CONDITIONAL([C2], [test -n "$two"])
AC_OUTPUT
diff --git a/tests/cond31.test b/tests/cond31.test
index 5c0c0010d..d6006cb0d 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_SUBST([CC], [false])
AC_SUBST([OBJEXT], [o])
AM_CONDITIONAL([C1], [test -z "$two"])
diff --git a/tests/cond32.test b/tests/cond32.test
index a728ceb54..9845e8c2f 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([C1], [test -z "$two"])
AM_CONDITIONAL([C2], [test -n "$two"])
AM_CONDITIONAL([C3], [test -z "$three"])
diff --git a/tests/cond33.test b/tests/cond33.test
index 1aeaea309..9655d3b1e 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([INC], [test -z "$two"])
AC_OUTPUT
EOF
diff --git a/tests/cond34.test b/tests/cond34.test
index 8561ee20e..8349406a2 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([TWO], [test -n "$two"])
AC_OUTPUT
EOF
diff --git a/tests/cond35.test b/tests/cond35.test
index f8d5e8670..97b4c8ff1 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -20,7 +20,7 @@
required='cc lex yacc'
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
AC_PROG_CC
AM_PROG_LEX
diff --git a/tests/cond36.test b/tests/cond36.test
index 7f54db9df..82200cca9 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
AC_PROG_CC
AM_PROG_LEX
diff --git a/tests/cond37.test b/tests/cond37.test
index 1bfada098..6423d391b 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -n "$case_A"])
AC_OUTPUT
EOF
diff --git a/tests/cond38.test b/tests/cond38.test
index 9f13a4365..71ae69a0c 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], :)
AM_CONDITIONAL([CASE_B], :)
AC_OUTPUT
diff --git a/tests/cond39.test b/tests/cond39.test
index 837a867a0..840b8b804 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -21,7 +21,7 @@ required=cc
mkdir sub
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_CONDITIONAL([COND], [test "$COND" = true])
AM_COND_IF([COND], [],
diff --git a/tests/cond4.test b/tests/cond4.test
index e60569e65..9bd0cc6fd 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
AC_SUBST([OBJEXT], [o])
AM_CONDITIONAL([ONE], [test "x$CONDITION1" = "xtrue"])
diff --git a/tests/cond40.test b/tests/cond40.test
index f271dd6d6..7dadfc171 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_DEFUN([FOO],
[AC_CONFIG_FILES([$1])])
diff --git a/tests/cond41.test b/tests/cond41.test
index 3a0cbc75c..ee17a9580 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_COND_IF([BAD_COND],
[AC_CONFIG_FILES([file1])])
AC_OUTPUT
@@ -26,6 +26,6 @@ END
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep '^configure\.in:4:.*AM_COND_IF.* no such condition.*BAD_COND' stderr
+grep '^configure\.ac:4:.*AM_COND_IF.* no such condition.*BAD_COND' stderr
:
diff --git a/tests/cond42.test b/tests/cond42.test
index 75b8555ee..d4eee0104 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND], [:])
# The next line is needed so that cond-if.m4 is pulled in.
AM_COND_IF([COND])
@@ -30,8 +30,8 @@ END
edit_configure_in ()
{
- sed "$@" < configure.in >configure.int
- mv -f configure.int configure.in
+ sed "$@" < configure.ac >configure.int
+ mv -f configure.int configure.ac
rm -rf autom4te*.cache
}
@@ -39,21 +39,21 @@ edit_configure_in ()
$ACLOCAL
AUTOMAKE_fails
-grep '^configure\.in:8:.* condition stack' stderr
+grep '^configure\.ac:8:.* condition stack' stderr
edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/'
AUTOMAKE_fails
-grep '^configure\.in:7:.* else without if' stderr
+grep '^configure\.ac:7:.* else without if' stderr
edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
AUTOMAKE_fails
-grep '^configure\.in:7:.* endif without if' stderr
+grep '^configure\.ac:7:.* endif without if' stderr
edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
_AM_COND_ENDIF/'
AUTOMAKE_fails
-grep '^configure\.in:7:.* not enough arguments.* _AM_COND_IF' stderr
-grep '^configure\.in:8:.* not enough arguments.* _AM_COND_ENDIF' stderr
+grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr
+grep '^configure\.ac:8:.* not enough arguments.* _AM_COND_ENDIF' stderr
test 2 = `grep -c 'not enough arguments' stderr`
:
diff --git a/tests/cond43.test b/tests/cond43.test
index 148ecd4df..028168ec2 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [:])
AM_CONDITIONAL([COND2], [:])
AM_COND_IF([COND1],
@@ -31,13 +31,13 @@ END
$ACLOCAL
AUTOMAKE_fails
-$EGREP '^configure\.in:7:.* missing m4 quoting.*macro depth 2( |$)' stderr
+$EGREP '^configure\.ac:7:.* missing m4 quoting.*macro depth 2( |$)' stderr
sed '/.AM_COND_IF/{
s/^/[/
s/$/]/
- }' < configure.in > configure.int
-mv -f configure.int configure.in
+ }' < configure.ac > configure.int
+mv -f configure.int configure.ac
rm -rf autom4te*.cache
$AUTOMAKE
diff --git a/tests/cond44.test b/tests/cond44.test
index 662572d50..8cc2c2e91 100755
--- a/tests/cond44.test
+++ b/tests/cond44.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_CONDITIONAL([COND], [true])
AM_SUBST_NOTMAKE([libdir])
AC_OUTPUT
diff --git a/tests/cond45.test b/tests/cond45.test
index 659c121d9..1296cd188 100755
--- a/tests/cond45.test
+++ b/tests/cond45.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_SUBST([foo], [bar])
AM_SUBST_NOTMAKE([foo])
AM_CONDITIONAL([COND], [true])
diff --git a/tests/cond46.test b/tests/cond46.test
index 7278428a3..8d6ef02a3 100755
--- a/tests/cond46.test
+++ b/tests/cond46.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([USE_A], [test x = y])
AM_CONDITIONAL([USE_B], [test x = z])
AC_OUTPUT
diff --git a/tests/cond5.test b/tests/cond5.test
index e1875149f..dd45678e9 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([ONE], [true])
AM_CONDITIONAL([TWO], [false])
diff --git a/tests/cond6.test b/tests/cond6.test
index e63164078..f6a499d1c 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AM_CONDITIONAL([FOO], [true])' >> configure.in
+echo 'AM_CONDITIONAL([FOO], [true])' >> configure.ac
cat > Makefile.am << 'END'
if FOO
@@ -52,7 +52,7 @@ $AUTOMAKE
rm -rf autom4te*.cache
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
touch aclocal.m4 # Avoid unnecessary firing the remake rules.
$AUTOCONF
$AUTOMAKE Makefile
diff --git a/tests/cond7.test b/tests/cond7.test
index 7864fc998..1651ac981 100755
--- a/tests/cond7.test
+++ b/tests/cond7.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
compat=yes
AM_CONDITIONAL([Compatible], [test x$compat = xyes])
AC_OUTPUT
diff --git a/tests/cond8.test b/tests/cond8.test
index a4e2b5d30..f21aacba9 100755
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([X], [test "$x" = yes])
AC_OUTPUT
diff --git a/tests/cond9.test b/tests/cond9.test
index 1c6679279..b9addabeb 100755
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([WRONG], [test x = y])
AC_OUTPUT
END
diff --git a/tests/condd.test b/tests/condd.test
index 8a9cc62cf..be32b7d1d 100755
--- a/tests/condd.test
+++ b/tests/condd.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl Define a macro with the same name as the conditional to exhibit
dnl any underquoted bug.
AC_DEFUN([COND1], ["some'meaningless;characters`])
diff --git a/tests/condhook.test b/tests/condhook.test
index a0df1cad2..3b0f89c2a 100755
--- a/tests/condhook.test
+++ b/tests/condhook.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [false])
AC_OUTPUT
END
diff --git a/tests/condhook2.test b/tests/condhook2.test
index 40662c9e8..a853e37a2 100755
--- a/tests/condhook2.test
+++ b/tests/condhook2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
AC_OUTPUT
END
diff --git a/tests/condinc.test b/tests/condinc.test
index 6236bd8db..b7011e76d 100755
--- a/tests/condinc.test
+++ b/tests/condinc.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TOBE], [false])
END
diff --git a/tests/condinc2.test b/tests/condinc2.test
index 942f5aebf..e88b0d276 100755
--- a/tests/condinc2.test
+++ b/tests/condinc2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([TOBE], [false])
END
diff --git a/tests/condlib.test b/tests/condlib.test
index fd0119914..fae04bff6 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AM_MAINTAINER_MODE
AM_PROG_AR
diff --git a/tests/condman3.test b/tests/condman3.test
index 5d79c47ec..9f2714ffe 100755
--- a/tests/condman3.test
+++ b/tests/condman3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$FOO" = x"true"])
AC_OUTPUT
END
diff --git a/tests/conff.test b/tests/conff.test
index ede7712cc..d9696608e 100755
--- a/tests/conff.test
+++ b/tests/conff.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar/Makefile:bar/Makefile.in:Makefile.bot])
AC_OUTPUT
END
diff --git a/tests/conff2.test b/tests/conff2.test
index f851f80e1..2c42f29bc 100755
--- a/tests/conff2.test
+++ b/tests/conff2.test
@@ -18,9 +18,9 @@
. ./defs || Exit 1
-# We avoid using configure.in stub initialized by ./defs, since we need
+# We avoid using configure.ac stub initialized by ./defs, since we need
# to keep track of line numbers (to grep for error messages).
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES ([oops])
@@ -30,7 +30,7 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:3:.* arguments .*AC_CONFIG_FILES' stderr
-grep 'configure\.in:4:.* arguments .*AC_CONFIG_HEADERS' stderr
+grep 'configure\.ac:3:.* arguments .*AC_CONFIG_FILES' stderr
+grep 'configure\.ac:4:.* arguments .*AC_CONFIG_HEADERS' stderr
:
diff --git a/tests/conffile-leading-dot.test b/tests/conffile-leading-dot.test
index 732e10ffd..9c4cb4fff 100755
--- a/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@ -21,7 +21,7 @@
required=GNUmake
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([./Makefile])
@@ -34,16 +34,16 @@ touch a.in b.in c.in Makefile.am
$ACLOCAL
AUTOMAKE_fails -Wnone -Wunsupported
-grep "^configure\.in:3:.*'\\./Makefile'" stderr
-grep "^configure\.in:3:.* omit leading '\\./'" stderr
-grep "^configure\.in:3:.*remake rules might be subtly broken" stderr
-grep "^configure\.in:4:.*'\\./foo'" stderr
-grep "^configure\.in:4:.* omit leading '\\./'" stderr
-grep "^configure\.in:4:.*remake rules might be subtly broken" stderr
+grep "^configure\.ac:3:.*'\\./Makefile'" stderr
+grep "^configure\.ac:3:.* omit leading '\\./'" stderr
+grep "^configure\.ac:3:.*remake rules might be subtly broken" stderr
+grep "^configure\.ac:4:.*'\\./foo'" stderr
+grep "^configure\.ac:4:.* omit leading '\\./'" stderr
+grep "^configure\.ac:4:.*remake rules might be subtly broken" stderr
# Check that our warning was actually justified.
-sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.in >t
-mv -f t configure.in
+sed 's/^AM_INIT_AUTOMAKE/&([-Wall -Wno-unsupported])/' <configure.ac >t
+mv -f t configure.ac
rm -rf autom4te*.cache
$ACLOCAL
$AUTOCONF
diff --git a/tests/confh.test b/tests/confh.test
index 1568c2f5f..ee574382b 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONFIG_HEADER([include/config.h])
AC_OUTPUT
END
diff --git a/tests/confh4.test b/tests/confh4.test
index 50ace63dd..ea6a9ffc2 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([include/Makefile])
AM_CONFIG_HEADER([include/config.h])
AC_PROG_CC
diff --git a/tests/confh5.test b/tests/confh5.test
index a43e4283e..c35c3e847 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([FOO], [NameToBeGrepped])
AC_CONFIG_FILES([include/config.h.in])
AC_CONFIG_HEADERS([config.h])
diff --git a/tests/confh6.test b/tests/confh6.test
index 109d02972..c5e7d7e58 100755
--- a/tests/confh6.test
+++ b/tests/confh6.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONFIG_HEADER([subdir/config.h])
AC_OUTPUT
END
diff --git a/tests/confh7.test b/tests/confh7.test
index fcc79d8a4..665a77496 100755
--- a/tests/confh7.test
+++ b/tests/confh7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONFIG_HEADER([config.h two.h])
END
@@ -33,7 +33,7 @@ $AUTOMAKE
# Try again with more macros.
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/confh8.test b/tests/confh8.test
index 1398b161e..d60dccbd1 100755
--- a/tests/confh8.test
+++ b/tests/confh8.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONFIG_HEADER([one.h two.h])
AC_OUTPUT
END
diff --git a/tests/confincl.test b/tests/confincl.test
index f86e40e02..dfc755106 100755
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/conflnk.test b/tests/conflnk.test
index 9d24c0eb9..75f9f2ee5 100755
--- a/tests/conflnk.test
+++ b/tests/conflnk.test
@@ -26,7 +26,7 @@ mkdir sdir
: > sdir/src2
mkdir sdir-no-make
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AC_CONFIG_FILES([sdir/Makefile])
AC_CONFIG_LINKS([dest:src])
AC_CONFIG_LINKS([dest2:src])
diff --git a/tests/conflnk2.test b/tests/conflnk2.test
index 1d0e1560a..4a1478b29 100755
--- a/tests/conflnk2.test
+++ b/tests/conflnk2.test
@@ -40,7 +40,7 @@ mkdir sdir
mkdir sdir-no-make
: > sdir-no-make/src4
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AC_CONFIG_FILES([sdir/Makefile])
AC_CONFIG_LINKS([dest:src])
AC_CONFIG_LINKS([sdir/dest2:src2 sdir-no-make/dest3:sdir/src3])
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index e12898d3c..ffb0d98c3 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -39,7 +39,7 @@ mkdir sdir
: > sdir/Makefile.am
: > sdir/src3
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AC_CONFIG_FILES([sdir/Makefile])
my_src_dir=sdir
my_dest=dest
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index 6675bc0da..02f3e2a1b 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -36,7 +36,7 @@ test: distdir
test -f $(distdir)/sdir/mk-subdir/src4
EOF
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
AC_CONFIG_FILES([sdir/Makefile])
AC_CONFIG_LINKS([src:src])
AC_CONFIG_LINKS([sdir/src2:sdir/src2])
diff --git a/tests/confsub.test b/tests/confsub.test
index c11a0878e..188704678 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
diff --git a/tests/confvar.test b/tests/confvar.test
index 2d773e84c..e77563ee1 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([QBERT])
END
diff --git a/tests/confvar2.test b/tests/confvar2.test
index 66d04dc8e..bc6ffcae7 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([OTHER_SCRIPTS])
END
diff --git a/tests/copy.test b/tests/copy.test
index 6da3617bd..e023231bd 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -46,12 +46,12 @@ test -f install-sh
is_not_symlink install-sh
# Let's do a couple of more elaborated tests, this time with the auxdir
-# explicitly defined in configure.in.
+# explicitly defined in configure.ac.
mkdir sub
cd sub
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
AM_INIT_AUTOMAKE
diff --git a/tests/cscope.tap b/tests/cscope.tap
index 36adeca75..c39feedd7 100755
--- a/tests/cscope.tap
+++ b/tests/cscope.tap
@@ -22,7 +22,7 @@ plan_ 18
ocwd=`pwd` || fatal_ "getting top-level directory"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_SUBST([CC], [who-cares])
AC_SUBST([CXX], [who-cares])
diff --git a/tests/cscope2.test b/tests/cscope2.test
index bd5e1c4f8..e47989b42 100755
--- a/tests/cscope2.test
+++ b/tests/cscope2.test
@@ -19,7 +19,7 @@
required=
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
: >Makefile.am
diff --git a/tests/cscope3.test b/tests/cscope3.test
index bf2716cc5..cd3082d5f 100755
--- a/tests/cscope3.test
+++ b/tests/cscope3.test
@@ -21,7 +21,7 @@
required=cscope
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/cxx.test b/tests/cxx.test
index eafe4f644..c69aac681 100755
--- a/tests/cxx.test
+++ b/tests/cxx.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
END
diff --git a/tests/cxx2.test b/tests/cxx2.test
index e40ef223f..243e607d0 100755
--- a/tests/cxx2.test
+++ b/tests/cxx2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >>configure.in
+echo AC_PROG_CC >>configure.ac
cat >Makefile.am <<'END'
bin_PROGRAMS = hello
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 69010f77b..cc69163ca 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXXCPP
END
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index ef397261c..6f4ce2ea1 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_CC
AC_REPLACE_FUNCS(strdup)
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index 4a196beb4..5ce3beb6f 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
END
diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index 055b35f53..66d0b0df2 100755
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
END
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 56a9598ac..a754701d7 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -17,7 +17,7 @@
# Make sure C++ files are rewritten to ".o" and not just "o".
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
END
diff --git a/tests/cygnus-check-without-all.test b/tests/cygnus-check-without-all.test
index 1efc0b5f3..f428e9533 100755
--- a/tests/cygnus-check-without-all.test
+++ b/tests/cygnus-check-without-all.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_MAINTAINER_MODE
AC_OUTPUT
END
diff --git a/tests/cygnus-dependency-tracking.test b/tests/cygnus-dependency-tracking.test
index 5a567f0fa..f07c6fc51 100755
--- a/tests/cygnus-dependency-tracking.test
+++ b/tests/cygnus-dependency-tracking.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_MAINTAINER_MODE
AC_PROG_CC
AC_OUTPUT
diff --git a/tests/cygnus-imply-foreign.test b/tests/cygnus-imply-foreign.test
index ea8a1891a..3dcf6715a 100755
--- a/tests/cygnus-imply-foreign.test
+++ b/tests/cygnus-imply-foreign.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
# This is *required* in cygnus mode
AM_MAINTAINER_MODE
END
@@ -48,13 +48,13 @@ echo 'AUTOMAKE_OPTIONS = gnu cygnus' >> Makefile.am
$AUTOMAKE -Werror
mv -f Makefile.sav Makefile.am
-# Try again, this time enabling cygnus mode from configure.in.
-cp configure.in configure.sav
-sed 's/^AM_INIT_AUTOMAKE$/&([gnits cygnus])/' configure.sav >configure.in
-cmp configure.in configure.sav && fatal_ 'failed to edit configure.in'
+# Try again, this time enabling cygnus mode from configure.ac.
+cp configure.ac configure.sav
+sed 's/^AM_INIT_AUTOMAKE$/&([gnits cygnus])/' configure.sav >configure.ac
+cmp configure.ac configure.sav && fatal_ 'failed to edit configure.ac'
$ACLOCAL --force
$AUTOMAKE -Werror
-mv -f configure.sav configure.in
+mv -f configure.sav configure.ac
:
diff --git a/tests/cygnus-no-dist.test b/tests/cygnus-no-dist.test
index 9c4b781e5..eccf7fd59 100755
--- a/tests/cygnus-no-dist.test
+++ b/tests/cygnus-no-dist.test
@@ -18,10 +18,10 @@
. ./defs || Exit 1
-echo AM_MAINTAINER_MODE >> configure.in
-mv -f configure.in configure.stub
+echo AM_MAINTAINER_MODE >> configure.ac
+mv -f configure.ac configure.stub
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_OUTPUT
END
@@ -57,7 +57,7 @@ cat > sub2/Makefile.am <<'END'
AUTOMAKE_OPTIONS = cygnus -Wall
END
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_OUTPUT
END
diff --git a/tests/cygnus-no-installinfo.test b/tests/cygnus-no-installinfo.test
index f05d01548..9b0b19913 100755
--- a/tests/cygnus-no-installinfo.test
+++ b/tests/cygnus-no-installinfo.test
@@ -19,7 +19,7 @@
required=makeinfo
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_MAINTAINER_MODE
AC_OUTPUT
END
diff --git a/tests/cygnus-requires-maintainer-mode.test b/tests/cygnus-requires-maintainer-mode.test
index 43cc5f007..b01dfbcb8 100755
--- a/tests/cygnus-requires-maintainer-mode.test
+++ b/tests/cygnus-requires-maintainer-mode.test
@@ -22,9 +22,9 @@
$ACLOCAL
AUTOMAKE_fails --cygnus
-grep '^configure\.in:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
+grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
END
@@ -40,9 +40,9 @@ END
rm -rf autom4te.cache
$ACLOCAL
AUTOMAKE_fails
-grep '^configure\.in:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
+grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_MAINTAINER_MODE
END
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index b78654464..9415fb64c 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/defs b/tests/defs
index a6eab904b..98bc8e1a5 100644
--- a/tests/defs
+++ b/tests/defs
@@ -1118,9 +1118,9 @@ else
"$am_scriptdir"/depcomp . \
|| framework_failure_ "fetching common files from $am_scriptdir"
# Build appropriate environment in test directory. E.g., create
- # configure.in, touch all necessary files, etc. Don't use AC_OUTPUT,
+ # configure.ac, touch all necessary files, etc. Don't use AC_OUTPUT,
# but AC_CONFIG_FILES so that appending still produces a valid
- # configure.in. But then, tests running config.status really need
+ # configure.ac. But then, tests running config.status really need
# to append AC_OUTPUT.
{
echo "AC_INIT([$me], [1.0])"
@@ -1130,7 +1130,7 @@ else
echo "AM_INIT_AUTOMAKE"
fi
echo "AC_CONFIG_FILES([Makefile])"
- } >configure.in || framework_failure_ "creating configure.in skeleton"
+ } >configure.ac || framework_failure_ "creating configure.ac skeleton"
fi
fi
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 6a815c0c9..c474d7af1 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -179,16 +179,6 @@ ACLOCAL="$am_original_ACLOCAL -Werror"
# should use $am_original_AUTOMAKE instead.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror -Wall"
-# This is a hack to seamlessly support the infamous "autoconf wrappers",
-# that might dispatch different autoconf versions depending on the name
-# of the input files and/or the command-line options used. See:
-# <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
-# FIXME: in the long run, the better fix will be to convert our testsuite
-# to use `configure.ac' instead of `configure.in' as autoconf input.
-AUTOCONF="$AUTOCONF -B /no/such/dir"
-AUTOM4TE="$AUTOM4TE -B /no/such/dir"
-AUTORECONF="$AUTORECONF -B /no/such/dir"
-
# POSIX no longer requires 'egrep' and 'fgrep',
# but some hosts lack 'grep -E' and 'grep -F'.
EGREP=${AM_TESTSUITE_EGREP-'@EGREP@'}
diff --git a/tests/defun.test b/tests/defun.test
index 6891ede82..9b66a56f3 100755
--- a/tests/defun.test
+++ b/tests/defun.test
@@ -24,7 +24,7 @@ AC_DEFUN([AM_FUNC_TWO], [@!GrepThisString!@AM_FUNC_THREE])
AC_DEFUN([AM_FUNC_ONE], [AC_REQUIRE([AM_FUNC_TWO])])
END
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AM_FUNC_ONE
END
diff --git a/tests/defun2.test b/tests/defun2.test
index 7bebc8e49..0b3f96b6d 100755
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl if buggy this will require getloadavg.c
AC_PROG_CC
AC_DEFUN([AC_FUNC_GETLOADAVG])
diff --git a/tests/dejagnu-absolute-builddir.test b/tests/dejagnu-absolute-builddir.test
index 856d9d0b9..8cdc3a1d7 100755
--- a/tests/dejagnu-absolute-builddir.test
+++ b/tests/dejagnu-absolute-builddir.test
@@ -20,7 +20,7 @@
required=runtest
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu-relative-srcdir.test b/tests/dejagnu-relative-srcdir.test
index 71f5bd987..05ae2005e 100755
--- a/tests/dejagnu-relative-srcdir.test
+++ b/tests/dejagnu-relative-srcdir.test
@@ -20,7 +20,7 @@
required=runtest
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu-siteexp-append.test b/tests/dejagnu-siteexp-append.test
index b37df5786..c3bfff6af 100755
--- a/tests/dejagnu-siteexp-append.test
+++ b/tests/dejagnu-siteexp-append.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu-siteexp-extend.test b/tests/dejagnu-siteexp-extend.test
index 5b1630a90..f0f61942a 100755
--- a/tests/dejagnu-siteexp-extend.test
+++ b/tests/dejagnu-siteexp-extend.test
@@ -32,7 +32,7 @@ write_check_for ()
END
}
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu-siteexp-useredit.test b/tests/dejagnu-siteexp-useredit.test
index d29b76917..9be5eba90 100755
--- a/tests/dejagnu-siteexp-useredit.test
+++ b/tests/dejagnu-siteexp-useredit.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index 2c3c8b8ad..0a0d0910f 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
index c8da7339c..7d15bc941 100755
--- a/tests/dejagnu3.test
+++ b/tests/dejagnu3.test
@@ -26,7 +26,7 @@ END
chmod +x hammer
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test
index 361bb95b2..44904dfbf 100755
--- a/tests/dejagnu4.test
+++ b/tests/dejagnu4.test
@@ -38,7 +38,7 @@ echo "I'm a right spanner!"
END
chmod +x spanner
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test
index 44447db2a..26eaa6096 100755
--- a/tests/dejagnu5.test
+++ b/tests/dejagnu5.test
@@ -28,7 +28,7 @@ echo "Ah, we have been expecting you, Mr. Blond."
END
chmod +x $package
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
index 24b3307bb..38255f6f8 100755
--- a/tests/dejagnu6.test
+++ b/tests/dejagnu6.test
@@ -25,7 +25,7 @@ echo whatever
END
chmod +x faildeja
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index b42aaf42f..a926955f6 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -29,7 +29,7 @@ echo whatever
END
chmod +x failtcl
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/deleted-am.test b/tests/deleted-am.test
index af3763990..11fefb7c9 100755
--- a/tests/deleted-am.test
+++ b/tests/deleted-am.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
echo 'include $(top_srcdir)/foobar.am' > Makefile.am
echo 'include zardoz.am' > foobar.am
diff --git a/tests/deleted-m4.test b/tests/deleted-m4.test
index 43f1017c2..69499b5e4 100755
--- a/tests/deleted-m4.test
+++ b/tests/deleted-m4.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
m4_include([foobar.m4])
AC_OUTPUT
END
diff --git a/tests/depacl2.test b/tests/depacl2.test
index 5c5ebf3d7..378a1a2a2 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo 'AM_FOO' >> configure.in
+echo 'AM_FOO' >> configure.ac
echo 'AC_DEFUN([AM_FOO], [AC_REQUIRE([AC_HEADER_STDC])])' > AM_FOO.m4
$ACLOCAL -I .
diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index d204058c9..66fe8da36 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -127,7 +127,7 @@ check_distclean ()
fi
}
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
diff --git a/tests/depcomp.test b/tests/depcomp.test
index 3d03766af..f2e0370e5 100755
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([subdir/Makefile subdir2/Makefile])
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 4980ed797..624dee6f0 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
AC_PROG_CC
AC_OUTPUT
diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test
index 05f7f2af3..7fb2602e5 100755
--- a/tests/depcomp8a.test
+++ b/tests/depcomp8a.test
@@ -22,7 +22,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
#x AM_PROG_CC_C_O
AC_OUTPUT
@@ -61,8 +61,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#x //' configure.ac >configure.int
+mv -f configure.int configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
$ACLOCAL
diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test
index ab87cceb8..49b44ca82 100755
--- a/tests/depcomp8b.test
+++ b/tests/depcomp8b.test
@@ -22,7 +22,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
#x AM_PROG_CC_C_O
AM_PROG_AR
@@ -56,8 +56,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#x //' configure.ac >configure.int
+mv -f configure.int configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
$ACLOCAL
diff --git a/tests/depdist.test b/tests/depdist.test
index d6bcc8302..e81e09783 100755
--- a/tests/depdist.test
+++ b/tests/depdist.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-rm -f configure.in
+rm -f configure.ac
mkdir config
for i in *; do
@@ -29,7 +29,7 @@ for i in *; do
fi
done
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE
diff --git a/tests/depend.test b/tests/depend.test
index e41a09fe5..6f816ba46 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = fred
diff --git a/tests/depend3.test b/tests/depend3.test
index 5303a7f82..8f8431afa 100755
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_SUBST(DEPS)
END
diff --git a/tests/depend4.test b/tests/depend4.test
index 7ef383d80..d9896f860 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
$ACLOCAL
diff --git a/tests/depend5.test b/tests/depend5.test
index bf6ca5447..ca900f0fc 100755
--- a/tests/depend5.test
+++ b/tests/depend5.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in << END
+cat >>configure.ac << END
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/depend6.test b/tests/depend6.test
index 276b35e22..fb4c14003 100755
--- a/tests/depend6.test
+++ b/tests/depend6.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << END
+cat >>configure.ac << END
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/deprecated-acinit.test b/tests/deprecated-acinit.test
index e94ab5d20..d130f9c44 100755
--- a/tests/deprecated-acinit.test
+++ b/tests/deprecated-acinit.test
@@ -31,21 +31,21 @@ errmsg='AC_INIT should be called with package and version argument'
for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
for am_init_automake in AM_INIT_AUTOMAKE 'AM_INIT_AUTOMAKE([1.11])'; do
rm -rf autom4te*.cache aclocal.m4
- unindent > configure.in <<END
+ unindent > configure.ac <<END
$ac_init
$am_init_automake
AC_CONFIG_FILES([Makefile])
END
- cat configure.in # For debugging.
+ cat configure.ac # For debugging.
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
- grep "^configure\\.in:.* $errmsg" stderr
+ grep "^configure\\.ac:.* $errmsg" stderr
cp aclocal-m4.sav aclocal.m4
$AUTOCONF 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
- grep "^configure\\.in:.* $errmsg" stderr
+ grep "^configure\\.ac:.* $errmsg" stderr
AUTOMAKE_fails
- grep "^configure\\.in:.* $errmsg" stderr
+ grep "^configure\\.ac:.* $errmsg" stderr
done
done
diff --git a/tests/destdir.test b/tests/destdir.test
index a0cf5584d..38ad08b47 100755
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -23,7 +23,7 @@ required='ro-dir'
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/dirlist-abspath.test b/tests/dirlist-abspath.test
index 4ae92e52e..78af8b1f2 100755
--- a/tests/dirlist-abspath.test
+++ b/tests/dirlist-abspath.test
@@ -26,7 +26,7 @@ echo 'AC_DEFUN([AM_FOO], [foo-foo--foo])' > acdir-more/foo.m4
cd sub
-cat > configure.in <<EOF
+cat > configure.ac <<EOF
AC_INIT([$me], [1.0])
AM_FOO
EOF
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 3f6a2d7c9..4cbebb458 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<EOF
+cat > configure.ac <<EOF
AC_INIT
AM_INIT_GUILE_MODULE
EOF
diff --git a/tests/dirlist2.test b/tests/dirlist2.test
index e84cfa097..38db51447 100755
--- a/tests/dirlist2.test
+++ b/tests/dirlist2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<EOF
+cat > configure.ac <<EOF
AC_INIT
AM_INIT_GUILE_MODULE
AM_FOO_BAR
diff --git a/tests/discover.test b/tests/discover.test
index d74fcf7be..7a01dc74d 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AM_PROG_AR
AC_PROG_CC
diff --git a/tests/dist-auxdir-many-subdirs.test b/tests/dist-auxdir-many-subdirs.test
index 478220b1b..c99935129 100755
--- a/tests/dist-auxdir-many-subdirs.test
+++ b/tests/dist-auxdir-many-subdirs.test
@@ -39,7 +39,7 @@ do_check ()
cd T$count.d
distdir=$me-$count
- unindent > configure.in << END
+ unindent > configure.ac << END
AC_INIT([$me], [$count])
AC_CONFIG_AUX_DIR([$auxdir])
AM_INIT_AUTOMAKE([parallel-tests])
@@ -79,12 +79,12 @@ END
for x in $suffixes; do
mkdir sub$x
echo "SUBDIRS += sub$x" >> Makefile.am
- echo "AC_CONFIG_FILES([sub$x/Makefile])" >> configure.in
+ echo "AC_CONFIG_FILES([sub$x/Makefile])" >> configure.ac
cp Makefile.stub sub$x/Makefile.am
echo 'int main (void) { return 0; }' > sub$x/foo.c
touch sub$x/bar.py sub$x/baz.el
done
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
$ACLOCAL
$AUTOCONF
diff --git a/tests/dist-auxfile-2.test b/tests/dist-auxfile-2.test
index 1b051eef7..50dd5fe37 100755
--- a/tests/dist-auxfile-2.test
+++ b/tests/dist-auxfile-2.test
@@ -22,7 +22,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([sub])
AM_INIT_AUTOMAKE
diff --git a/tests/dist-auxfile.test b/tests/dist-auxfile.test
index 0b3bb6ae9..53a74161f 100755
--- a/tests/dist-auxfile.test
+++ b/tests/dist-auxfile.test
@@ -31,7 +31,7 @@ for auxdir in build-aux ''; do
mkdir T$i.d
cd T$i.d
- unindent > configure.in <<END
+ unindent > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([${auxdir:-.}])
AM_INIT_AUTOMAKE
@@ -74,9 +74,9 @@ END
$AUTOCONF
AUTOMAKE_fails
- grep "^configure\\.in:4:.* required file.*$auxdir_rx/foo\\.txt" stderr
- grep "^configure\\.in:5:.* required file.*$auxdir_rx/bar\\.sh" stderr
- grep "^configure\\.in:6:.* required file.*$auxdir_rx/zardoz" stderr
+ grep "^configure\\.ac:4:.* required file.*$auxdir_rx/foo\\.txt" stderr
+ grep "^configure\\.ac:5:.* required file.*$auxdir_rx/bar\\.sh" stderr
+ grep "^configure\\.ac:6:.* required file.*$auxdir_rx/zardoz" stderr
touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
cp "$am_scriptdir"/missing "$am_scriptdir"/install-sh $auxdir \
diff --git a/tests/dist-formats.tap b/tests/dist-formats.tap
index 612af54a4..821c8e0fa 100755
--- a/tests/dist-formats.tap
+++ b/tests/dist-formats.tap
@@ -126,14 +126,14 @@ start_subtest ()
am_opts=`echo $am_opts | tr ',' ' '`
mkdir "$name"
cd "$name"
- unindent > configure.in <<END
+ unindent > configure.ac <<END
AC_INIT([$name], [1.0])
AM_INIT_AUTOMAKE([$ac_opts])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
echo "AUTOMAKE_OPTIONS = $am_opts" > Makefile.am
- # It is imperative that aclocal.m4 is copied after configure.in has
+ # It is imperative that aclocal.m4 is copied after configure.ac has
# been created, to avoid a spurious trigger of the automatic remake
# rules for configure & co.
cp "$ocwd"/aclocal.m4 \
@@ -221,7 +221,7 @@ nogzip_automake_failure 'am' 'Makefile\.am:1'
end_subtest
start_subtest ac-nogz-only am_opts= ac_opts=no-dist-gzip
-nogzip_automake_failure 'ac' 'configure\.in:2'
+nogzip_automake_failure 'ac' 'configure\.ac:2'
end_subtest
# ------------------------------------------------- #
@@ -382,12 +382,12 @@ unset flip fmt
echo '])' >> am-init.m4
-sed 's/AM_INIT_AUTOMAKE.*/m4_include([am-init.m4])/' configure.in > t
-mv -f t configure.in
+sed 's/AM_INIT_AUTOMAKE.*/m4_include([am-init.m4])/' configure.ac > t
+mv -f t configure.ac
# For debugging.
cat Makefil.am
-cat configure.in
+cat configure.ac
cat am-init.m4
command_ok_ "$desc [aclocal]" $ACLOCAL --force
diff --git a/tests/dist-included-parent-dir.test b/tests/dist-included-parent-dir.test
index 552cc3821..88ca414e1 100755
--- a/tests/dist-included-parent-dir.test
+++ b/tests/dist-included-parent-dir.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/dist-missing-am.test b/tests/dist-missing-am.test
index 52a613b4d..aa4298999 100755
--- a/tests/dist-missing-am.test
+++ b/tests/dist-missing-am.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
include $(srcdir)/foobar.am
diff --git a/tests/dist-missing-included-m4.test b/tests/dist-missing-included-m4.test
index 9e8cd7aea..8c3c7576e 100755
--- a/tests/dist-missing-included-m4.test
+++ b/tests/dist-missing-included-m4.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
m4_include([foobar.m4])
m4_include([zardoz.m4])
AC_OUTPUT
diff --git a/tests/dist-missing-m4.test b/tests/dist-missing-m4.test
index a6f248f28..61ed200a5 100755
--- a/tests/dist-missing-m4.test
+++ b/tests/dist-missing-m4.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
m4_pattern_forbid([^MY_])
MY_FOOBAR || exit 1
MY_ZARDOZ || exit 1
diff --git a/tests/dist-readonly.test b/tests/dist-readonly.test
index 934ea69d2..1aa32c804 100755
--- a/tests/dist-readonly.test
+++ b/tests/dist-readonly.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/dist-repeated.test b/tests/dist-repeated.test
index 00c071ed5..6651e72c9 100755
--- a/tests/dist-repeated.test
+++ b/tests/dist-repeated.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
bin_PROGRAMS = foo bar
diff --git a/tests/distcheck-configure-flags-am.test b/tests/distcheck-configure-flags-am.test
index 917c4decb..7dbe2ab3d 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/tests/distcheck-configure-flags-am.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
[:],
diff --git a/tests/distcheck-configure-flags-subpkg.test b/tests/distcheck-configure-flags-subpkg.test
index 94c7f8f5a..45d0e0cb6 100755
--- a/tests/distcheck-configure-flags-subpkg.test
+++ b/tests/distcheck-configure-flags-subpkg.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SUBDIRS([subpkg])
if test $dc != ok || test $am_dc != ok; then
AC_MSG_ERROR([dc=$dc am_dc=$dc])
@@ -32,12 +32,12 @@ END
mkdir subpkg
-sed <configure.in >subpkg/configure.in \
+sed <configure.ac >subpkg/configure.ac \
-e 's/^AC_INIT.*/AC_INIT([subpkg], [2.0])/' \
-e '/^AC_CONFIG_SUBDIRS/d' \
-cat configure.in
-cat subpkg/configure.in
+cat configure.ac
+cat subpkg/configure.ac
dc=KO am_dc=KO; export dc am_dc
diff --git a/tests/distcheck-configure-flags.test b/tests/distcheck-configure-flags.test
index 310158b29..bef9351c4 100755
--- a/tests/distcheck-configure-flags.test
+++ b/tests/distcheck-configure-flags.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
[:],
diff --git a/tests/distcheck-hook.test b/tests/distcheck-hook.test
index 5b76d54bc..dfc20010a 100755
--- a/tests/distcheck-hook.test
+++ b/tests/distcheck-hook.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/distcheck-hook2.test b/tests/distcheck-hook2.test
index 94614615e..93446b3bc 100755
--- a/tests/distcheck-hook2.test
+++ b/tests/distcheck-hook2.test
@@ -20,14 +20,14 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SUBDIRS([subpkg])
AC_OUTPUT
END
mkdir subpkg
-cat > subpkg/configure.in << 'END'
+cat > subpkg/configure.ac << 'END'
AC_INIT([subpkg], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
index 60762b5dd..376038423 100755
--- a/tests/distcheck-missing-m4.test
+++ b/tests/distcheck-missing-m4.test
@@ -31,7 +31,7 @@ ACLOCAL_AMFLAGS = -I m4
include $(srcdir)/distcheck-hook-m4.am
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl We *deliberately* don't use m4_pattern_forbid here.
AC_OUTPUT
MY_FOO
@@ -92,7 +92,7 @@ $MAKE distcheck
# We start to use new "third-party" macros from new .m4 files, but forget
# to re-run "aclocal --install" by hand, relying on automatic remake rules.
# Our distcheck-hook should catch this too.
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
MY_QUX
MY_BLA
END
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
index c49a00316..68e0d76a2 100755
--- a/tests/distcheck-outdated-m4.test
+++ b/tests/distcheck-outdated-m4.test
@@ -31,7 +31,7 @@ ACLOCAL_AMFLAGS = -I m4
include $(srcdir)/distcheck-hook-m4.am
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
MY_FOO
MY_BAR
@@ -70,7 +70,7 @@ check_no_spurious_error ()
# of a pre-existing third-party m4 file, but forget to re-run
# "aclocal --install" by hand, relying on automatic remake
# rules. Our distcheck-hook should catch this too.
-echo MY_ZARDOZ >> configure.in
+echo MY_ZARDOZ >> configure.ac
cat > acdir/baz.m4 << 'END'
# serial 2
@@ -97,7 +97,7 @@ $MAKE distcheck
# - use ACLOCAL_PATH, and
# - do not add the use of a new macro.
-echo MY_FNORD >> configure.in
+echo MY_FNORD >> configure.ac
mkdir pth
cat > pth/fnord.m4 << 'END'
diff --git a/tests/distcheck-override-infodir.test b/tests/distcheck-override-infodir.test
index 8a010012a..746b5f859 100755
--- a/tests/distcheck-override-infodir.test
+++ b/tests/distcheck-override-infodir.test
@@ -20,7 +20,7 @@
required='makeinfo tex texi2dvi install-info'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/distcheck-pr10470.test b/tests/distcheck-pr10470.test
index 5e90d0ace..1b6a3226a 100755
--- a/tests/distcheck-pr10470.test
+++ b/tests/distcheck-pr10470.test
@@ -30,7 +30,7 @@ sh -c "cd foo.d && sleep '4'" &
sleep '1'
rm -rf foo.d && skip_ 'system is able to remove "in use" directories'
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<END
TESTS = foo.test
diff --git a/tests/distcheck-pr9579.test b/tests/distcheck-pr9579.test
index 5fb34470a..d2d3c69ab 100755
--- a/tests/distcheck-pr9579.test
+++ b/tests/distcheck-pr9579.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
index 38a06c4c0..cc4f4956b 100755
--- a/tests/distcleancheck.test
+++ b/tests/distcleancheck.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/distcom-subdir.test b/tests/distcom-subdir.test
index 836232315..dcad10d76 100755
--- a/tests/distcom-subdir.test
+++ b/tests/distcom-subdir.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
AC_PROG_CC
AC_OUTPUT
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 0eba22c46..0f8cba0fb 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_CONFIG_FILES([subdir/Makefile])
@@ -74,7 +74,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.in (by AM_PROG_CC_C_O).
+ # Makefile because it's required in configure.ac (by AM_PROG_CC_C_O).
$FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
done
diff --git a/tests/distcom4.test b/tests/distcom4.test
index 1589becba..dc37fcf4f 100755
--- a/tests/distcom4.test
+++ b/tests/distcom4.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
[chmod +x tests/autoconf])
AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
diff --git a/tests/distcom5.test b/tests/distcom5.test
index d9b43dabb..adfbe52d1 100755
--- a/tests/distcom5.test
+++ b/tests/distcom5.test
@@ -36,7 +36,7 @@ extract_distcommon ()
}' -e '/^DIST_COMMON =/ p' ${1+"$@"}
}
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
[chmod +x tests/autoconf])
AC_CONFIG_FILES([tests/autoheader:tests/wrapper.in],
diff --git a/tests/distdir.test b/tests/distdir.test
index a6aa26171..6e2bba52c 100755
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/distlinks.test b/tests/distlinks.test
index ffe70e560..08244c06e 100755
--- a/tests/distlinks.test
+++ b/tests/distlinks.test
@@ -38,7 +38,7 @@ ln -s bar2 bar3
ln -s "`pwd`/foo" quux
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
index 8dcd81e1e..67408df3e 100755
--- a/tests/distlinksbrk.test
+++ b/tests/distlinksbrk.test
@@ -44,7 +44,7 @@ test -h $lnk2
test -h $lnka
test -h $lnkb
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/distname.test b/tests/distname.test
index 1c1029e0f..0ef3cdb4c 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([a.c])
AC_PROG_CC
AC_OUTPUT
diff --git a/tests/dmalloc.test b/tests/dmalloc.test
index 6fd0836c3..286bcf7d2 100755
--- a/tests/dmalloc.test
+++ b/tests/dmalloc.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([config.h])
AM_WITH_DMALLOC
AC_SUBST([LDFLAGS])
diff --git a/tests/doc-parsing-buglets-tabs.test b/tests/doc-parsing-buglets-tabs.test
index 057017d4e..22c981c63 100755
--- a/tests/doc-parsing-buglets-tabs.test
+++ b/tests/doc-parsing-buglets-tabs.test
@@ -42,7 +42,7 @@ just_to_separate: dummy deps
${tab}bin_PROGRAMS = foo
END
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
$ACLOCAL
$AUTOMAKE
diff --git a/tests/dollar.test b/tests/dollar.test
index 29bc7b400..2747e5d8c 100755
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -23,7 +23,7 @@
required=GNUmake
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'EOF'
mydir = $(prefix)/my
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index e3fa2812a..3c49c3aa6 100755
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.test
@@ -48,7 +48,7 @@ grep 'Makefile.am:7' stderr
# This should work with the AM_SILENT_RULES macro.
$sleep
-echo 'AM_SILENT_RULES' >> configure.in
+echo 'AM_SILENT_RULES' >> configure.ac
$ACLOCAL --force
AUTOMAKE_fails -Wportability
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
index 46e22ca76..3f66a1d72 100755
--- a/tests/dollarvar2.test
+++ b/tests/dollarvar2.test
@@ -69,7 +69,7 @@ noinst_PROGRAMS = foo
foo_CPPFLAGS = -Dwhatever
EOF
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
$ACLOCAL --force
diff --git a/tests/double.test b/tests/double.test
index 1b9962a90..7f353b799 100755
--- a/tests/double.test
+++ b/tests/double.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
diff --git a/tests/dup2.test b/tests/dup2.test
index b50ce51f3..d40582839 100755
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_FUNC_STRTOD
END
diff --git a/tests/else.test b/tests/else.test
index 26ca9b44f..74d21586b 100755
--- a/tests/else.test
+++ b/tests/else.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
+echo 'AM_CONDITIONAL(FOO, true)' >> configure.ac
cat > Makefile.am << 'END'
# Flag to tell us if apache dir is a source distribution.
diff --git a/tests/empty.test b/tests/empty.test
index 78b5ffd28..795f92226 100755
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
echo 'data_DATA =' >Makefile.am
$ACLOCAL
diff --git a/tests/empty2.test b/tests/empty2.test
index 1fcaaafe9..7d1242301 100755
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/empty3.test b/tests/empty3.test
index 5415c7d52..6aabfbaa9 100755
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/empty4.test b/tests/empty4.test
index c68483985..810642607 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_SUBST(ZOO_OBJ)
END
diff --git a/tests/exdir3.test b/tests/exdir3.test
index 88c0db861..672548c44 100755
--- a/tests/exdir3.test
+++ b/tests/exdir3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_SUBST([pkgdatadir], ["FOO"])
AC_OUTPUT
EOF
diff --git a/tests/exeext.test b/tests/exeext.test
index fb36e3cd1..0ccc6465a 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -24,7 +24,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([WANT_MT], [test -z "$revert"])
AM_CONDITIONAL([WANT_RMT], [test -z "$revert"])
diff --git a/tests/exeext2.test b/tests/exeext2.test
index d420debb4..3315ad8db 100755
--- a/tests/exeext2.test
+++ b/tests/exeext2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/exeext3.test b/tests/exeext3.test
index a93bec5ce..1bc1a1022 100755
--- a/tests/exeext3.test
+++ b/tests/exeext3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/exeext4.test b/tests/exeext4.test
index 8a657a653..298879dee 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test -n "$cond"])
AC_SUBST([programs], ['prg1$(EXEEXT) prg2$(EXEEXT)'])
AC_SUBST([CC], [whocares])
diff --git a/tests/exsource.test b/tests/exsource.test
index e685e467e..15b274f07 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = www
diff --git a/tests/ext.test b/tests/ext.test
index d7e512b66..3fad1a183 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
AC_PROG_FC
AC_PROG_OBJC
diff --git a/tests/ext2.test b/tests/ext2.test
index 1dc5235a8..3df028208 100755
--- a/tests/ext2.test
+++ b/tests/ext2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CXX
EOF
diff --git a/tests/ext3.test b/tests/ext3.test
index 0ea2e6247..bd5ed6dd3 100755
--- a/tests/ext3.test
+++ b/tests/ext3.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
END
cat > Makefile.am << 'END'
diff --git a/tests/extra-portability.test b/tests/extra-portability.test
index 9f4a4b471..4f684bbe1 100755
--- a/tests/extra-portability.test
+++ b/tests/extra-portability.test
@@ -25,7 +25,7 @@
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_PROG_CC
AC_PROG_RANLIB
AC_OUTPUT
diff --git a/tests/extra-portability2.test b/tests/extra-portability2.test
index d2894ac46..db4a594f8 100755
--- a/tests/extra-portability2.test
+++ b/tests/extra-portability2.test
@@ -22,7 +22,7 @@
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_PROG_CC
AC_PROG_RANLIB
AC_OUTPUT
diff --git a/tests/extra-portability3.test b/tests/extra-portability3.test
index 2c760a523..1c1f518df 100755
--- a/tests/extra-portability3.test
+++ b/tests/extra-portability3.test
@@ -22,7 +22,7 @@
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_PROG_CC
AC_PROG_RANLIB
AC_OUTPUT
diff --git a/tests/extra-programs-empty.test b/tests/extra-programs-empty.test
index 5c1e87930..bc061bf6f 100755
--- a/tests/extra-programs-empty.test
+++ b/tests/extra-programs-empty.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([Makefile2 Makefile3])
AC_SUBST([prog])
AC_PROG_CC
diff --git a/tests/extra.test b/tests/extra.test
index a5452c5c5..7bad9ef0a 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/extra10.test b/tests/extra10.test
index 3f498b4f6..8fe7133d2 100755
--- a/tests/extra10.test
+++ b/tests/extra10.test
@@ -22,7 +22,7 @@
required=GNUmake
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
EXTRA_DIST = *.foo
diff --git a/tests/extra11.test b/tests/extra11.test
index 5c5be7f4f..a645afbe4 100755
--- a/tests/extra11.test
+++ b/tests/extra11.test
@@ -20,7 +20,7 @@
required=GNUmake
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS = -Wno-portability
diff --git a/tests/extra12.test b/tests/extra12.test
index 8ce2c2a72..979411592 100755
--- a/tests/extra12.test
+++ b/tests/extra12.test
@@ -21,7 +21,7 @@
required=GNUmake
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
diff --git a/tests/extra2.test b/tests/extra2.test
index e97207e64..30eaeeda6 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/extra3.test b/tests/extra3.test
index 179e611db..406580106 100755
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AC_SUBST(CODICIL)' >> configure.in
+echo 'AC_SUBST(CODICIL)' >> configure.ac
cat > Makefile.am << 'END'
sysconf_DATA = @CODICIL@
diff --git a/tests/extra4.test b/tests/extra4.test
index 716d1802e..5b31b63ac 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AC_SUBST(CODICIL)' >> configure.in
+echo 'AC_SUBST(CODICIL)' >> configure.ac
cat > Makefile.am << 'END'
sysconf_DATA = @CODICIL@
diff --git a/tests/extra5.test b/tests/extra5.test
index f6ef21ff0..7fdd9838d 100755
--- a/tests/extra5.test
+++ b/tests/extra5.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
EXTRA_DIST=foo
diff --git a/tests/extra6.test b/tests/extra6.test
index 2b5ef72a7..6b512114b 100755
--- a/tests/extra6.test
+++ b/tests/extra6.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
EXTRA_DIST=foo/bar baz foo2/bar2 baz2
diff --git a/tests/extra7.test b/tests/extra7.test
index 3c77b4320..4ad778959 100755
--- a/tests/extra7.test
+++ b/tests/extra7.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
EXTRA_DIST=foo/bar baz
diff --git a/tests/extra8.test b/tests/extra8.test
index ff055f37b..9eef189d1 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/extra9.test b/tests/extra9.test
index 5f01024e1..b5a6007c1 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/extradep.test b/tests/extradep.test
index cf949b51a..77b806a97 100755
--- a/tests/extradep.test
+++ b/tests/extradep.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/extradep2.test b/tests/extradep2.test
index 9bf67fe05..91722bd0a 100755
--- a/tests/extradep2.test
+++ b/tests/extradep2.test
@@ -19,7 +19,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/f90only.test b/tests/f90only.test
index 66b1d678b..a65a91ecf 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_FC
END
diff --git a/tests/flavor.test b/tests/flavor.test
index 327b44747..c892350d7 100755
--- a/tests/flavor.test
+++ b/tests/flavor.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
AC_OUTPUT
END
diff --git a/tests/flibs.test b/tests/flibs.test
index 058acfaf0..706a0ac0d 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
AC_F77_LIBRARY_LDFLAGS
END
diff --git a/tests/fn99.test b/tests/fn99.test
index b2c208f25..c4a0001a0 100755
--- a/tests/fn99.test
+++ b/tests/fn99.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat >Makefile.am <<'END'
AUTOMAKE_OPTIONS = filename-length-max=99
diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test
index e05eea128..5fb93eaee 100755
--- a/tests/fn99subdir.test
+++ b/tests/fn99subdir.test
@@ -22,7 +22,7 @@
# The name is so that 99 is exactly hit (including final \0).
subdirname='cnfsubdir'
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_CONFIG_SUBDIRS([$subdirname])
AC_OUTPUT
END
@@ -34,7 +34,7 @@ END
mkdir $subdirname
-cat >> $subdirname/configure.in <<EOF
+cat >> $subdirname/configure.ac <<EOF
AC_INIT([$subdirname], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/fnoc.test b/tests/fnoc.test
index ca7179f1b..fbd21352f 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
END
diff --git a/tests/fo.test b/tests/fo.test
index 819456666..50b4f4a12 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
END
diff --git a/tests/fonly.test b/tests/fonly.test
index ea7ae226b..c3ae61481 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
END
diff --git a/tests/fort2.test b/tests/fort2.test
index 9ea755d06..d345592ef 100755
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -23,7 +23,7 @@
mkdir sub
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_FC
AC_FC_SRCEXT([f90])
AC_FC_SRCEXT([f95])
diff --git a/tests/fort4.test b/tests/fort4.test
index 31b9f2565..a23c9bda5 100755
--- a/tests/fort4.test
+++ b/tests/fort4.test
@@ -47,7 +47,7 @@ END
sed s,foo,bar, foo.f90 > sub/bar.f90
sed s,foo,baz, foo.f90 > sub/baz.f
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_F77
AC_PROG_FC
AC_FC_SRCEXT([f90], [],
diff --git a/tests/fort5.test b/tests/fort5.test
index 44af17915..4614b661d 100755
--- a/tests/fort5.test
+++ b/tests/fort5.test
@@ -48,7 +48,7 @@ END
sed s,foo,bar, foo.f90 > sub/bar.f90
sed s,foo,baz, foo.f90 > sub/baz.f
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_F77
AC_PROG_FC
AC_FC_SRCEXT([f90], [],
diff --git a/tests/fortdep.test b/tests/fortdep.test
index 5e25bf943..d10644d88 100755
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([foo.f])
AC_PROG_F77
AC_OUTPUT
diff --git a/tests/gcj.test b/tests/gcj.test
index 3335cbb76..b510f1c76 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
_AM_DEPENDENCIES([GCJ])
AC_SUBST([GCJ])
END
diff --git a/tests/gcj2.test b/tests/gcj2.test
index d34957a9a..92eed4543 100755
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
_AM_DEPENDENCIES(GCJ)
AC_SUBST(GCJ)
END
diff --git a/tests/gcj3.test b/tests/gcj3.test
index 02c71c7d6..a8ec120b6 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
_AM_DEPENDENCIES([GCJ])
AC_SUBST([GCJ])
END
diff --git a/tests/gcj4.test b/tests/gcj4.test
index 58e2ff682..4d2db9f8f 100755
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -19,7 +19,7 @@
required=gcj
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_GCJ
AC_OUTPUT
END
diff --git a/tests/gcj5.test b/tests/gcj5.test
index c09e895f8..f3c218f30 100755
--- a/tests/gcj5.test
+++ b/tests/gcj5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
_AM_DEPENDENCIES(GCJ)
END
diff --git a/tests/gcj6.test b/tests/gcj6.test
index 17603bac9..3fe4a31f6 100755
--- a/tests/gcj6.test
+++ b/tests/gcj6.test
@@ -19,7 +19,7 @@
required='gcj'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_GCJ
AC_OUTPUT
END
diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test
index e3408a922..460b79385 100755
--- a/tests/gettext-macros.test
+++ b/tests/gettext-macros.test
@@ -46,14 +46,14 @@ else
fi
# We will need to specify the correct autopoint (or gettextize) version
-# in the AM_GNU_GETTEXT_VERSION call in configure.in if we want autopoint
+# in the AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint
# (or gettextize) to setup the correct infrastructure -- in particular,
# for what concerns us, to bring in all the required .m4 files.
autopoint_version=`extract_program_version $am_gettextize_command` \
&& test -n "$autopoint_version" \
|| autopoint_version=0.10.35
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([foo], [1.0])
AC_PROG_CC
# Both required by autopoint.
diff --git a/tests/gettext.test b/tests/gettext.test
index 0fcef2cb3..12bbc7df2 100755
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -19,7 +19,7 @@
required='gettext'
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION([0.14.3])
AC_OUTPUT
@@ -46,8 +46,8 @@ if $ACLOCAL; then
fi
: >config.rpath
-sed '/AM_GNU_GETTEXT_VERSION/d' configure.in >configure.int
-mv -f configure.int configure.in
+sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.int
+mv -f configure.int configure.ac
$ACLOCAL
diff --git a/tests/gettext2.test b/tests/gettext2.test
index 488743c12..254d06eb6 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -20,7 +20,7 @@
required='gettext'
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_GNU_GETTEXT([external])
AC_OUTPUT
END
diff --git a/tests/gettext3.test b/tests/gettext3.test
index a30f5fb48..7ebd43606 100755
--- a/tests/gettext3.test
+++ b/tests/gettext3.test
@@ -19,7 +19,7 @@
required='gettext'
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_INTL_SUBDIR
AC_OUTPUT
diff --git a/tests/gnits.test b/tests/gnits.test
index fda8c5ce4..badb8b0c3 100755
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [3.5.3.2])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES(Makefile)
@@ -39,4 +39,4 @@ END
$ACLOCAL
AUTOMAKE_fails --gnits
-grep 'configure.in:.*3\.5\.3\.2' stderr
+grep 'configure.ac:.*3\.5\.3\.2' stderr
diff --git a/tests/gnits2.test b/tests/gnits2.test
index d65586fff..ef7078cc2 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -19,7 +19,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 17ab6f06d..931d04e20 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/gnumake.test b/tests/gnumake.test
index 804a8a76f..b1ea0002f 100755
--- a/tests/gnumake.test
+++ b/tests/gnumake.test
@@ -20,7 +20,7 @@
required=GNUmake
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/GNUmakefile])
AC_OUTPUT
END
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index 9b87f1554..5aac432b7 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -21,7 +21,7 @@
# We need (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE -Werror"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
index 9ff3aea59..cda3a9a55 100755
--- a/tests/gnuwarn2.test
+++ b/tests/gnuwarn2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([gnuwarn2], [1.0])
AM_INIT_AUTOMAKE([no-installman])
AC_CONFIG_FILES([Makefile])
@@ -39,4 +39,4 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure.in:2:.*no-installman' stderr
+grep 'configure.ac:2:.*no-installman' stderr
diff --git a/tests/hdr-vars-defined-once.test b/tests/hdr-vars-defined-once.test
index d0c5135d6..1e31cd201 100755
--- a/tests/hdr-vars-defined-once.test
+++ b/tests/hdr-vars-defined-once.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/header.test b/tests/header.test
index ba33933b3..dc93ac87a 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -25,7 +25,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([MY_HEADERS])
AC_PROG_CC
END
diff --git a/tests/help-depend.test b/tests/help-depend.test
index bb128d42f..cb57c43db 100755
--- a/tests/help-depend.test
+++ b/tests/help-depend.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_DEP_TRACK
END
diff --git a/tests/help-depend2.test b/tests/help-depend2.test
index c2787eb0b..76d0ae61e 100755
--- a/tests/help-depend2.test
+++ b/tests/help-depend2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_PROG_CC
diff --git a/tests/help-dmalloc.test b/tests/help-dmalloc.test
index afa94aa85..1ed614010 100755
--- a/tests/help-dmalloc.test
+++ b/tests/help-dmalloc.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_WITH_DMALLOC
END
diff --git a/tests/help-init.test b/tests/help-init.test
index 3e8f40af7..14925770c 100755
--- a/tests/help-init.test
+++ b/tests/help-init.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
END
diff --git a/tests/help-lispdir.test b/tests/help-lispdir.test
index fd1ddfa8c..597f942c6 100755
--- a/tests/help-lispdir.test
+++ b/tests/help-lispdir.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_PATH_LISPDIR
END
diff --git a/tests/help-multilib.test b/tests/help-multilib.test
index 512ec502e..28dac1667 100755
--- a/tests/help-multilib.test
+++ b/tests/help-multilib.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_ENABLE_MULTILIB
END
diff --git a/tests/help-python.test b/tests/help-python.test
index dca11dbb9..48f15fb8f 100755
--- a/tests/help-python.test
+++ b/tests/help-python.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_PATH_PYTHON
END
diff --git a/tests/help-silent.test b/tests/help-silent.test
index 8953232ad..2c78212f9 100755
--- a/tests/help-silent.test
+++ b/tests/help-silent.test
@@ -19,20 +19,20 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_SILENT_RULES
END
$ACLOCAL
-mv -f configure.in configure.tmpl
+mv -f configure.ac configure.tmpl
q="[\`'\"]"
for args in '' '([])' '([yes])' '([no])'; do
- sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.in
- cat configure.in
+ sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac
+ cat configure.ac
$AUTOCONF --force
grep_configure_help --enable-silent-rules \
" less verbose build.*\\(undo.*${q}make V=1${q}"
diff --git a/tests/help-upc.test b/tests/help-upc.test
index 8d41c58a7..b7b01f8e7 100755
--- a/tests/help-upc.test
+++ b/tests/help-upc.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_PROG_UPC
END
diff --git a/tests/help.test b/tests/help.test
index b1cc2d86f..2f7c2d1ba 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -34,7 +34,7 @@ $AUTOMAKE --version
$AUTOMAKE --help
# Sanity checks: aclocal and automake cannot work without configure.ac
-# or configure.in.
+# nor configure.in.
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
diff --git a/tests/help2.test b/tests/help2.test
index de9e77937..0d433f462 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure --help and --version work, even when the current directory
-# contains a broken configure.in and a broken acinclude.m4.
+# contains a broken configure.ac and a broken acinclude.m4.
. ./defs || Exit 1
# Ensure we run in a new, clean directory.
@@ -27,7 +27,7 @@ cd cleandir
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
-echo '[' > configure.in
+echo '[' > configure.ac
echo '[' > acinclude.m4
$AUTOMAKE --version
@@ -42,11 +42,11 @@ $FGREP acinclude.m4 stderr
rm -f acinclude.m4
-# Sanity checks: aclocal and automake cannot work with broken configure.in.
+# Sanity checks: aclocal and automake cannot work with broken configure.ac.
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-$FGREP configure.in stderr
+$FGREP configure.ac stderr
AUTOMAKE_fails
-$FGREP configure.in stderr
+$FGREP configure.ac stderr
:
diff --git a/tests/help3.test b/tests/help3.test
index e72eed2a3..54e06d57c 100755
--- a/tests/help3.test
+++ b/tests/help3.test
@@ -27,7 +27,7 @@ cd cleandir
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([.]) dnl prevent automake from looking into '..'
AM_INIT_AUTOMAKE([foreign])
diff --git a/tests/hfs.test b/tests/hfs.test
index 505932e18..60000406f 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -21,7 +21,7 @@
# Report from Peter O'Gorman.
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
: >CHANGELOG
echo 'EXTRA_DIST = CHANGELOG' >Makefile.am
diff --git a/tests/implicit.test b/tests/implicit.test
index 9efb8fc15..a9a068b9b 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/init.test b/tests/init.test
index 474b90be5..d57681489 100755
--- a/tests/init.test
+++ b/tests/init.test
@@ -22,16 +22,16 @@
for ac_init_args in '' '([x])'; do
for am_init_args in '' '([1.10])'; do
rm -rf aclocal.m4 autom4te*.cache
- unindent >configure.in <<END
+ unindent >configure.ac <<END
AC_INIT$ac_init_args
AM_INIT_AUTOMAKE$am_init_args
END
- cat configure.in # For debugging.
+ cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
$FGREP AC_PACKAGE_VERSION stderr && Exit 1
- grep 'configure\.in:.* AC_INIT .*arguments' stderr
+ grep 'configure\.ac:.* AC_INIT .*arguments' stderr
done
done
diff --git a/tests/init2.test b/tests/init2.test
index 003a3e01a..44e79cb9c 100755
--- a/tests/init2.test
+++ b/tests/init2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >configure.in <<END
+cat >configure.ac <<END
AC_INIT([init2], [1.0])
AM_INIT_AUTOMAKE([nosuchoption])
END
diff --git a/tests/insh2.test b/tests/insh2.test
index fdefafabc..cd74f82a5 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
pkgdata_DATA =
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index bbca73e44..c05318db8 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -30,7 +30,7 @@ mkdir bin
saved_PATH=$PATH; export saved_PATH
PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/install2.test b/tests/install2.test
index 831370175..10ab856b7 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
dnl Prevent automake from looking in .. and ../..
AC_CONFIG_AUX_DIR(.)
diff --git a/tests/instdat.test b/tests/instdat.test
index 011ba4f1b..0754a0941 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_SUBST([INSTALL_DATA])
END
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 0a80a3b8f..4d47d19a8 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/instdir-lisp.test b/tests/instdir-lisp.test
index 1b91cfbfe..f019504d2 100755
--- a/tests/instdir-lisp.test
+++ b/tests/instdir-lisp.test
@@ -19,7 +19,7 @@
required=emacs
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_PATH_LISPDIR
AC_OUTPUT
END
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 0be8c22b7..ded16cd5b 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -21,7 +21,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_AR
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 3f8028e40..e0948c088 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -21,7 +21,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_AR
diff --git a/tests/instdir-python.test b/tests/instdir-python.test
index a16008a64..f48353deb 100755
--- a/tests/instdir-python.test
+++ b/tests/instdir-python.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_PATH_PYTHON
AC_OUTPUT
END
diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
index 32c8873a0..4e4887a7a 100755
--- a/tests/instdir-texi.test
+++ b/tests/instdir-texi.test
@@ -25,7 +25,7 @@ dvips --help \
pdfetex --version || pdftex --version \
|| skip_ "pdeftex and pdftex are both missing"
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/instdir.test b/tests/instdir.test
index e0592ed80..f09fdfa7c 100755
--- a/tests/instdir.test
+++ b/tests/instdir.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_SUBST([foodir], ['${datadir}'/foo])
AC_OUTPUT
END
diff --git a/tests/instdir2.test b/tests/instdir2.test
index 1c6035739..bdfa80999 100755
--- a/tests/instdir2.test
+++ b/tests/instdir2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_SUBST([foodir], ['${datadir}'/foo])
AC_OUTPUT
END
diff --git a/tests/instfail-info.test b/tests/instfail-info.test
index 510f61013..58aef975c 100755
--- a/tests/instfail-info.test
+++ b/tests/instfail-info.test
@@ -22,7 +22,7 @@
required='makeinfo'
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/instfail-java.test b/tests/instfail-java.test
index 18aa53ca6..0ae80f58e 100755
--- a/tests/instfail-java.test
+++ b/tests/instfail-java.test
@@ -22,7 +22,7 @@
required=javac
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/instfail-libtool.test b/tests/instfail-libtool.test
index e45f45be5..0acfd2c5a 100755
--- a/tests/instfail-libtool.test
+++ b/tests/instfail-libtool.test
@@ -22,7 +22,7 @@
required='cc libtool libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_PROG_AR
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/instfail.test b/tests/instfail.test
index 2d65d1300..1e5a340f7 100755
--- a/tests/instfail.test
+++ b/tests/instfail.test
@@ -22,7 +22,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/insthook.test b/tests/insthook.test
index 6969d98ca..14674d504 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_PROG_LN_S
AC_OUTPUT
EOF
diff --git a/tests/instman.test b/tests/instman.test
index 7c47ac7e2..787104592 100755
--- a/tests/instman.test
+++ b/tests/instman.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'EOF'
man_MANS = frob.8
diff --git a/tests/instmany-mans.test b/tests/instmany-mans.test
index 8b024a383..664244298 100755
--- a/tests/instmany-mans.test
+++ b/tests/instmany-mans.test
@@ -62,7 +62,7 @@ END
chmod +x rm
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
AC_CONFIG_FILES([$subdir/Makefile])
AC_OUTPUT
diff --git a/tests/instmany-python.test b/tests/instmany-python.test
index 416250f09..d0c5b1a95 100755
--- a/tests/instmany-python.test
+++ b/tests/instmany-python.test
@@ -58,7 +58,7 @@ END
chmod +x rm
-cat >>configure.in <<END
+cat >>configure.ac <<END
AM_PATH_PYTHON
AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
AC_CONFIG_FILES([$subdir/Makefile])
diff --git a/tests/instmany.test b/tests/instmany.test
index a1bfae0a8..076119903 100755
--- a/tests/instmany.test
+++ b/tests/instmany.test
@@ -70,7 +70,7 @@ END
chmod +x rm
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_CONFIG_FILES([myinstall], [chmod +x ./myinstall])
AC_CONFIG_FILES([$subdir/Makefile])
AC_OUTPUT
diff --git a/tests/instsh.test b/tests/instsh.test
index 79736d406..38bbacce3 100755
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -26,7 +26,7 @@ rm -f install-sh
# Since the default path includes '../..', we must run this test in
# yet another subdir.
mkdir frob
-mv Makefile.am configure.in frob/
+mv Makefile.am configure.ac frob/
cd frob
$ACLOCAL
diff --git a/tests/instspc.tap b/tests/instspc.tap
index e46429944..cbe0fdfdd 100755
--- a/tests/instspc.tap
+++ b/tests/instspc.tap
@@ -71,7 +71,7 @@ create_input_data ()
{
mkdir sub
- unindent >> configure.in << 'EOF'
+ unindent >> configure.ac << 'EOF'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/interp.test b/tests/interp.test
index e0e8f575b..b45d44932 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/interp2.test b/tests/interp2.test
index e9ca2b14a..3ce33e253 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PATH_X
AC_PATH_XTRA
diff --git a/tests/java-check.test b/tests/java-check.test
index cf926f15e..230fb96f1 100755
--- a/tests/java-check.test
+++ b/tests/java-check.test
@@ -21,7 +21,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/java-clean.test b/tests/java-clean.test
index 7b4e08bdd..239920172 100755
--- a/tests/java-clean.test
+++ b/tests/java-clean.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/java-compile-install.test b/tests/java-compile-install.test
index 7472bcf44..eb120a3e8 100755
--- a/tests/java-compile-install.test
+++ b/tests/java-compile-install.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index b8a0ae8a8..48b1feace 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -27,9 +27,9 @@ required='java javac'
am_parallel_tests=no
. ./defs || Exit 1
-echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.in
+echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([JAVA], [java])
AC_CONFIG_SRCDIR([PkgLocation.jin])
AC_CONFIG_FILES([PkgLocation.java:PkgLocation.jin])
diff --git a/tests/java-compile-run-nested.test b/tests/java-compile-run-nested.test
index fa53a0f89..9c9523cdb 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -28,9 +28,9 @@ required='java javac'
am_parallel_tests=yes
. ./defs || Exit 1
-echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.in
+echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([JAVA], [java])
AC_CONFIG_SRCDIR([jprog/PkgLocation.jin])
AC_SUBST([jprogdatadir], ['${pkgdatadir}'])
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
index f229383e0..9ec48b28b 100755
--- a/tests/java-empty-classpath.test
+++ b/tests/java-empty-classpath.test
@@ -20,7 +20,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_SRCDIR([org/gnu/bug/Library.java])
AC_CONFIG_FILES([
org/Makefile
diff --git a/tests/java-extra.test b/tests/java-extra.test
index bab71afc2..f2fc76d31 100755
--- a/tests/java-extra.test
+++ b/tests/java-extra.test
@@ -22,7 +22,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
AC_OUTPUT
END
diff --git a/tests/java-mix.test b/tests/java-mix.test
index 25ce6d9a3..7f2d9293b 100755
--- a/tests/java-mix.test
+++ b/tests/java-mix.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/java-nobase.test b/tests/java-nobase.test
index 75ab418e0..168ace3ef 100755
--- a/tests/java-nobase.test
+++ b/tests/java-nobase.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/java-noinst.test b/tests/java-noinst.test
index ba33771b8..b11e6a000 100755
--- a/tests/java-noinst.test
+++ b/tests/java-noinst.test
@@ -20,7 +20,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/java-rebuild.test b/tests/java-rebuild.test
index 480759493..37ead3a1d 100755
--- a/tests/java-rebuild.test
+++ b/tests/java-rebuild.test
@@ -19,7 +19,7 @@
required='javac'
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/java-sources.test b/tests/java-sources.test
index cc8b7da62..a3cbb17ab 100755
--- a/tests/java-sources.test
+++ b/tests/java-sources.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/java-uninstall.test b/tests/java-uninstall.test
index 2c44d9c3e..97cc4abc9 100755
--- a/tests/java-uninstall.test
+++ b/tests/java-uninstall.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/java.test b/tests/java.test
index c5881aa10..16b125038 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -19,7 +19,7 @@
required=javac
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/java2.test b/tests/java2.test
index d71430816..c0b9f957d 100755
--- a/tests/java2.test
+++ b/tests/java2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL(WITH_JDK, false)
AC_OUTPUT
END
diff --git a/tests/java3.test b/tests/java3.test
index 41b3ae2f4..c8162b14c 100755
--- a/tests/java3.test
+++ b/tests/java3.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([WHO_CARES], [false])
AC_OUTPUT
END
diff --git a/tests/javaflags.test b/tests/javaflags.test
index 4bcf6d467..000ce463f 100755
--- a/tests/javaflags.test
+++ b/tests/javaflags.test
@@ -28,7 +28,7 @@ chmod a+x fake-javac
# with `make -e' below.
unset JAVAC || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
# Simulate presence of the java compiler using our fake-javac script.
AC_SUBST([JAVAC], ['$(abs_top_srcdir)'/fake-javac])
diff --git a/tests/javaprim.test b/tests/javaprim.test
index 3995ef958..fe5553572 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([JAVA])
END
diff --git a/tests/javasubst.test b/tests/javasubst.test
index 78b76ee47..455b8c653 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([JAVAC])
END
diff --git a/tests/ldadd.test b/tests/ldadd.test
index cf047dc01..a0bd02191 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -19,7 +19,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AC_SUBST([LTLIBOBJS], [q.lo])
diff --git a/tests/ldflags.test b/tests/ldflags.test
index 729dfe97c..269af345e 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -20,7 +20,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
index 453c35370..81b416944 100755
--- a/tests/lex-clean-cxx.test
+++ b/tests/lex-clean-cxx.test
@@ -25,7 +25,7 @@ required=lex
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex-clean.test b/tests/lex-clean.test
index 06f8d8956..4dccc9256 100755
--- a/tests/lex-clean.test
+++ b/tests/lex-clean.test
@@ -24,7 +24,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
index 478a55fb0..e1560ee0c 100755
--- a/tests/lex-depend-cxx.test
+++ b/tests/lex-depend-cxx.test
@@ -22,7 +22,7 @@ required=lex
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AM_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex-depend-grep.test b/tests/lex-depend-grep.test
index e38f35362..863df133e 100755
--- a/tests/lex-depend-grep.test
+++ b/tests/lex-depend-grep.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AM_PROG_LEX
diff --git a/tests/lex-depend.test b/tests/lex-depend.test
index e2e37df60..17f66e94c 100755
--- a/tests/lex-depend.test
+++ b/tests/lex-depend.test
@@ -22,7 +22,7 @@ required=lex
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex-lib-external.test b/tests/lex-lib-external.test
index 47bee778a..3163e669f 100755
--- a/tests/lex-lib-external.test
+++ b/tests/lex-lib-external.test
@@ -20,7 +20,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LEX
diff --git a/tests/lex-lib.test b/tests/lex-lib.test
index f874f37fc..f84fc343c 100755
--- a/tests/lex-lib.test
+++ b/tests/lex-lib.test
@@ -21,7 +21,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/lex-libobj.test b/tests/lex-libobj.test
index 3837a0b1b..1ebe90cb4 100755
--- a/tests/lex-libobj.test
+++ b/tests/lex-libobj.test
@@ -20,7 +20,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LEX
diff --git a/tests/lex-line.test b/tests/lex-line.test
index 641bcaf14..008328da6 100755
--- a/tests/lex-line.test
+++ b/tests/lex-line.test
@@ -24,7 +24,7 @@ required=lex
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/lex-nodist.test b/tests/lex-nodist.test
index dc6c843c0..4dbb7191e 100755
--- a/tests/lex-nodist.test
+++ b/tests/lex-nodist.test
@@ -25,7 +25,7 @@ required=lex
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
dnl Sister test 'lex-pr204.test' should use 'AC_PROG_LEX' instead.
AM_PROG_LEX
diff --git a/tests/lex-noyywrap.test b/tests/lex-noyywrap.test
index a0eb731e3..8be4c91c6 100755
--- a/tests/lex-noyywrap.test
+++ b/tests/lex-noyywrap.test
@@ -19,7 +19,7 @@
required='cc flex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex-pr204.test b/tests/lex-pr204.test
index d991b36ad..4c05cc6fa 100755
--- a/tests/lex-pr204.test
+++ b/tests/lex-pr204.test
@@ -25,7 +25,7 @@ required=lex
set -e
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AM_MAINTAINER_MODE
AC_PROG_CC
dnl We use AC_PROG_LEX deliberately.
diff --git a/tests/lex-subobj-nodep.test b/tests/lex-subobj-nodep.test
index ff5fd485b..8bfc153ba 100755
--- a/tests/lex-subobj-nodep.test
+++ b/tests/lex-subobj-nodep.test
@@ -20,7 +20,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >>configure.in <<\END
+cat >>configure.ac <<\END
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_LEX
diff --git a/tests/lex.test b/tests/lex.test
index 3316550e6..d3d256a98 100755
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -16,7 +16,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_LEX
END
diff --git a/tests/lex2.test b/tests/lex2.test
index af3eea702..4b20d14f7 100755
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/lex3.test b/tests/lex3.test
index b8bb4659d..9751deb40 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -21,7 +21,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_LEX
AC_OUTPUT
diff --git a/tests/lex5.test b/tests/lex5.test
index 616470b04..dcccc2ed2 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -19,7 +19,7 @@
required='cc lex'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_LEX
diff --git a/tests/lexcpp.test b/tests/lexcpp.test
index 2b77c1909..717be0e03 100755
--- a/tests/lexcpp.test
+++ b/tests/lexcpp.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_LEX
END
diff --git a/tests/lexvpath.test b/tests/lexvpath.test
index 0cdaf84b5..70bff55b8 100755
--- a/tests/lexvpath.test
+++ b/tests/lexvpath.test
@@ -29,7 +29,7 @@ cat > lexoutroot.in << 'END'
LEX_OUTPUT_ROOT='@LEX_OUTPUT_ROOT@'
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([lexoutroot])
AC_PROG_CC
AC_PROG_LEX
diff --git a/tests/lflags.test b/tests/lflags.test
index e4b51774b..a29e147b9 100755
--- a/tests/lflags.test
+++ b/tests/lflags.test
@@ -33,7 +33,7 @@ chmod a+x fake-lex
# with `make -e' below.
unset LEX || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([CC], [false])
# Simulate presence of Lex using our fake-lex script.
AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
diff --git a/tests/lflags2.test b/tests/lflags2.test
index 158146d0a..a5afd21a4 100755
--- a/tests/lflags2.test
+++ b/tests/lflags2.test
@@ -32,7 +32,7 @@ chmod a+x fake-lex
# with `make -e' below.
unset LEX || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([CXX], [false])
# Simulate presence of Lex using our fake-lex script.
AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
diff --git a/tests/libexec.test b/tests/libexec.test
index b993e5371..24a934da3 100755
--- a/tests/libexec.test
+++ b/tests/libexec.test
@@ -23,7 +23,7 @@ libexec_PROGRAMS = foo
pkglibexec_PROGRAMS = bar
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/libobj-basic.test b/tests/libobj-basic.test
index 75a5cb1ec..f8394d66e 100755
--- a/tests/libobj-basic.test
+++ b/tests/libobj-basic.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-mv configure.in configure.proto
+mv configure.ac configure.proto
cat >> configure.proto << 'END'
AC_PROG_CC
AM_PROG_AR
@@ -70,7 +70,7 @@ extern int dummy_liver;
END
# AC_LIBSOURCE should work also if called after AC_OUTPUT.
-cat configure.proto - > configure.in <<END
+cat configure.proto - > configure.ac <<END
AC_LIBSOURCE([maude.c])
END
@@ -97,7 +97,7 @@ extra_checks = maude-src maude-dist liver-src liver-dist
END
# AC_LIBSOURCES should work also if called after AC_OUTPUT.
-cat configure.proto - > configure.in <<END
+cat configure.proto - > configure.ac <<END
AC_LIBSOURCES([maude.c, liver.c])
END
diff --git a/tests/libobj10.test b/tests/libobj10.test
index ce5fc417d..a566b090c 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/libobj12.test b/tests/libobj12.test
index 8eafd9747..2a65a63f0 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/libobj13.test b/tests/libobj13.test
index 66e3fc469..ef63d8b0d 100755
--- a/tests/libobj13.test
+++ b/tests/libobj13.test
@@ -20,7 +20,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/libobj14.test b/tests/libobj14.test
index d36af9387..50554de49 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_PROG_CC
AC_LIBSOURCE([bar.c])
AM_CONDITIONAL([CASE], [:])
diff --git a/tests/libobj15a.test b/tests/libobj15a.test
index 2c290ea74..d306b7157 100755
--- a/tests/libobj15a.test
+++ b/tests/libobj15a.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
@@ -35,6 +35,6 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*foobar\.c.*' stderr
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
:
diff --git a/tests/libobj15b.test b/tests/libobj15b.test
index 107476c2e..f0466fd54 100755
--- a/tests/libobj15b.test
+++ b/tests/libobj15b.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
@@ -38,6 +38,6 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*foobar\.c.*' stderr
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
:
diff --git a/tests/libobj15c.test b/tests/libobj15c.test
index da59eb0ae..97192134b 100755
--- a/tests/libobj15c.test
+++ b/tests/libobj15c.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_LIBSOURCES([foobar.c, bazquux.c])
@@ -39,12 +39,12 @@ AUTOMAKE="$AUTOMAKE -Wno-extra-portability"
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*foobar\.c.*' stderr
-grep 'configure\.in:.*required file.*bazquux\.c.*' stderr
+grep 'configure\.ac:.*required file.*foobar\.c.*' stderr
+grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
: > foobar.c
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*bazquux\.c.*' stderr
+grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
grep 'foobar\.c' stderr && Exit 1
:
diff --git a/tests/libobj16a.test b/tests/libobj16a.test
index 1f9fe014a..1e78195a2 100755
--- a/tests/libobj16a.test
+++ b/tests/libobj16a.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-mv configure.in configure.proto
+mv configure.ac configure.proto
cat >> configure.proto << 'END'
AC_PROG_CC
AM_PROG_AR
@@ -77,8 +77,8 @@ sed '/%LIBOBJ-STUFF%/{
s/.*//
i\
AC_LIBOBJ([maude])
-}' configure.proto > configure.in
-cat configure.in # For debugging.
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
cat > extra-checks.am << 'END'
extra_checks = maude-src maude-dist maude-lib liver-not-dist
@@ -117,8 +117,8 @@ else\
AC_LIBOBJ([liver])\
fi\
AC_LIBSOURCES([maude.c, liver.c])
-}' configure.proto > configure.in
-cat configure.in # For debugging.
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
$ACLOCAL
$AUTOCONF
diff --git a/tests/libobj16b.test b/tests/libobj16b.test
index fbb9bd7b3..a607ce974 100755
--- a/tests/libobj16b.test
+++ b/tests/libobj16b.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-mv configure.in configure.proto
+mv configure.ac configure.proto
cat >> configure.proto << 'END'
AC_PROG_CC
AC_PROG_RANLIB
@@ -76,8 +76,8 @@ sed '/%LIBOBJ-STUFF%/{
s/.*//
i\
AC_LIBOBJ(maude) dnl: do not quote this!
-}' configure.proto > configure.in
-cat configure.in # For debugging.
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
cat > extra-checks.am << 'END'
extra_checks = maude-src maude-dist maude-lib liver-not-dist
@@ -117,8 +117,8 @@ else\
fi\
AC_LIBSOURCE(maude.c) dnl: do not quote this!\
AC_LIBSOURCE(liver.c) dnl: do not quote this!
-}' configure.proto > configure.in
-cat configure.in # For debugging.
+}' configure.proto > configure.ac
+cat configure.ac # For debugging.
$ACLOCAL
$AUTOCONF
diff --git a/tests/libobj17.test b/tests/libobj17.test
index bbb31d12a..0ced8d942 100755
--- a/tests/libobj17.test
+++ b/tests/libobj17.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AM_PROG_AR
diff --git a/tests/libobj18.test b/tests/libobj18.test
index 8792fc2b9..0ac743859 100755
--- a/tests/libobj18.test
+++ b/tests/libobj18.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
@@ -38,8 +38,8 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*\$foo\.c.*not found' stderr
-grep 'configure\.in:.*required file.*\$bar\.c.*not found' stderr
-grep 'configure\.in:.*required file.*\$baz\.c.*not found' stderr
+grep 'configure\.ac:.*required file.*\$foo\.c.*not found' stderr
+grep 'configure\.ac:.*required file.*\$bar\.c.*not found' stderr
+grep 'configure\.ac:.*required file.*\$baz\.c.*not found' stderr
:
diff --git a/tests/libobj19.test b/tests/libobj19.test
index 5d9f6981e..4d9e2835d 100755
--- a/tests/libobj19.test
+++ b/tests/libobj19.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
AC_PROG_CC
AM_PROG_CC_C_O
@@ -79,9 +79,9 @@ echo SUBDIRS = sub > Makefile.am
sed '/^AC_OUTPUT/i\
AC_CONFIG_FILES([sub/Makefile])
-' configure.in > t
-mv -f t configure.in
-cat configure.in # For debugging.
+' configure.ac > t
+mv -f t configure.ac
+cat configure.ac # For debugging.
$ACLOCAL
$AUTOCONF
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 4d90afc75..ce655c232 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/libobj20a.test b/tests/libobj20a.test
index 1b26e6cf1..64969784a 100755
--- a/tests/libobj20a.test
+++ b/tests/libobj20a.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/libobj20b.test b/tests/libobj20b.test
index e8872fbc5..ec9193e10 100755
--- a/tests/libobj20b.test
+++ b/tests/libobj20b.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
AC_PROG_CC
AM_PROG_AR
@@ -42,12 +42,12 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure\.in:.*required directory.*libobj-dir' stderr
+grep 'configure\.ac:.*required directory.*libobj-dir' stderr
mkdir libobj-dir
: > foobar.c # Oops, it should be in libobj-dir!
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*libobj-dir/foobar.c.*' stderr
+grep 'configure\.ac:.*required file.*libobj-dir/foobar.c.*' stderr
rm -f foobar.c
diff --git a/tests/libobj20c.test b/tests/libobj20c.test
index 7408bc116..2aedbd09b 100755
--- a/tests/libobj20c.test
+++ b/tests/libobj20c.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
AC_PROG_CC
AC_PROG_RANLIB
@@ -39,12 +39,12 @@ $ACLOCAL
AUTOMAKE="$AUTOMAKE -Wno-extra-portability"
AUTOMAKE_fails
-grep 'configure\.in:.*required directory.*\./libobj-dir' stderr
+grep 'configure\.ac:.*required directory.*\./libobj-dir' stderr
mkdir libobj-dir
: > foobar.c # Oops, it should be in libobj-dir!
AUTOMAKE_fails
-grep 'configure\.in:.*required file.*libobj-dir/foobar.c.*' stderr
+grep 'configure\.ac:.*required file.*libobj-dir/foobar.c.*' stderr
rm -f foobar.c
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 3eac992a1..37ec6bf77 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -15,11 +15,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure we complain if @LIBOBJS@ is used without being set in
-# configure.in.
+# configure.ac.
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AM_PROG_AR
END
diff --git a/tests/libobj4.test b/tests/libobj4.test
index 31ee7eff6..68711afc8 100755
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -23,7 +23,7 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = foo
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_REPLACE_FUNCS([foo])
END
diff --git a/tests/libobj5.test b/tests/libobj5.test
index ad26cdab1..036ae561d 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -24,7 +24,7 @@ bin_PROGRAMS = joe
LDADD = @LIBOBJS@
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_REPLACE_FUNCS(\
foo_bar_quux)
diff --git a/tests/libobj7.test b/tests/libobj7.test
index a613216ba..56fb16e6b 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/library.test b/tests/library.test
index edc069385..dffe658cb 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AM_MAINTAINER_MODE
AC_PROG_CC
diff --git a/tests/library2.test b/tests/library2.test
index f7b6f5ab6..dfa87584c 100755
--- a/tests/library2.test
+++ b/tests/library2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/library3.test b/tests/library3.test
index 685eaee19..27a2b156f 100755
--- a/tests/library3.test
+++ b/tests/library3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AM_CONDITIONAL([A], [:])
AM_CONDITIONAL([B], [:])
diff --git a/tests/libtoo10.test b/tests/libtoo10.test
index 434080d2b..0218ef32c 100755
--- a/tests/libtoo10.test
+++ b/tests/libtoo10.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/libtoo11.test b/tests/libtoo11.test
index 5d11f61d6..cd55cc014 100755
--- a/tests/libtoo11.test
+++ b/tests/libtoo11.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_LIBTOOL
m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
AC_OUTPUT
diff --git a/tests/libtool-macros.test b/tests/libtool-macros.test
index 428410d6c..5d5b32865 100755
--- a/tests/libtool-macros.test
+++ b/tests/libtool-macros.test
@@ -35,7 +35,7 @@ else
# available, e.g., by properly setting ACLOCAL_PATH.
rm -rf m4
mkdir m4
- echo AC_PROG_LIBTOOL >> configure.in
+ echo AC_PROG_LIBTOOL >> configure.ac
# See below for an explanation about the use the of `-Wno-syntax'.
if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then
: # Libtool macros already accessible by default.
diff --git a/tests/libtool.test b/tests/libtool.test
index deb6f36f5..7b267a714 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -20,7 +20,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_LIBTOOL_DLOPEN
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
diff --git a/tests/libtool2.test b/tests/libtool2.test
index 21ad792fa..3b8a78b60 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -20,7 +20,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/libtool3.test b/tests/libtool3.test
index c1a386570..5ab3b0861 100755
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AM_PROG_LIBTOOL
diff --git a/tests/libtool4.test b/tests/libtool4.test
index 4efa8d3d9..2ce92dd29 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
END
diff --git a/tests/libtool5.test b/tests/libtool5.test
index 25fd526ec..b9e778b36 100755
--- a/tests/libtool5.test
+++ b/tests/libtool5.test
@@ -21,7 +21,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [false])
AC_PROG_CC
diff --git a/tests/libtool6.test b/tests/libtool6.test
index 360d56636..13dbc738e 100755
--- a/tests/libtool6.test
+++ b/tests/libtool6.test
@@ -20,7 +20,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [false])
AC_PROG_CC
diff --git a/tests/libtool7.test b/tests/libtool7.test
index 0c89a0391..bc8eacae3 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_LIBTOOL_DLOPEN
diff --git a/tests/libtool8.test b/tests/libtool8.test
index 7a566d7f9..352b87822 100755
--- a/tests/libtool8.test
+++ b/tests/libtool8.test
@@ -19,7 +19,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [false])
AC_PROG_CC
diff --git a/tests/libtool9.test b/tests/libtool9.test
index fcaad6f7d..b4d7baa87 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -22,7 +22,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_AR
diff --git a/tests/license.test b/tests/license.test
index e3eeefc17..c3dad694e 100755
--- a/tests/license.test
+++ b/tests/license.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
cat >Makefile.am <<\EOF
test1: distdir
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index 86c2e0b80..cd1715e27 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
END
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 1f2e9970c..3e49caf6f 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
END
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index a111ffd26..ab19d1329 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_FC
END
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index 1eabfb3ef..75126e3aa 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
END
diff --git a/tests/link_fc.test b/tests/link_fc.test
index d1e3614d2..dafff60c0 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_F77
END
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index 2f9695a85..b1236d433 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index b1a6fc500..854c7d435 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_F77
END
diff --git a/tests/link_override.test b/tests/link_override.test
index b48fcea16..48d32a26a 100755
--- a/tests/link_override.test
+++ b/tests/link_override.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/lisp3.test b/tests/lisp3.test
index d80d6bede..a1531d355 100755
--- a/tests/lisp3.test
+++ b/tests/lisp3.test
@@ -27,7 +27,7 @@ am-three.el:
CLEANFILES = am-three.el
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
AC_OUTPUT
EOF
diff --git a/tests/lisp4.test b/tests/lisp4.test
index 8f9310fbf..8d2de591a 100755
--- a/tests/lisp4.test
+++ b/tests/lisp4.test
@@ -47,7 +47,7 @@ not-installed:
find "$(lispdir)" | grep '\.elc$$' && exit 1; :
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
AC_OUTPUT
EOF
diff --git a/tests/lisp5.test b/tests/lisp5.test
index 572392eb0..997a56e73 100755
--- a/tests/lisp5.test
+++ b/tests/lisp5.test
@@ -46,7 +46,7 @@ not-installed:
find "$(lispdir)" | grep '\.elc$$' && exit 1; :
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
AC_OUTPUT
EOF
diff --git a/tests/lisp6.test b/tests/lisp6.test
index e2e839bf0..9635ea275 100755
--- a/tests/lisp6.test
+++ b/tests/lisp6.test
@@ -32,7 +32,7 @@ dist-test: distdir
test -f $(distdir)/am-three.el
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_CONDITIONAL([WANT_TWO], [test -n "$want_two"])
AM_PATH_LISPDIR
AC_OUTPUT
diff --git a/tests/lisp7.test b/tests/lisp7.test
index c55f86c20..79799d160 100755
--- a/tests/lisp7.test
+++ b/tests/lisp7.test
@@ -22,7 +22,7 @@ cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
EMACS=no # Simulate no emacs.
AC_OUTPUT
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 4604b5cc0..299ecd0a4 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -23,7 +23,7 @@ cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
AC_OUTPUT
EOF
diff --git a/tests/lispdry.test b/tests/lispdry.test
index 03031e9db..b5c0f2606 100755
--- a/tests/lispdry.test
+++ b/tests/lispdry.test
@@ -23,7 +23,7 @@ cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AM_PATH_LISPDIR
AC_OUTPUT
EOF
diff --git a/tests/listval.test b/tests/listval.test
index 66016a5b6..5e2f9a64c 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -20,7 +20,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([LTLIBOBJS])
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/location.test b/tests/location.test
index 8c7718532..e2d44da89 100755
--- a/tests/location.test
+++ b/tests/location.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
AC_PROG_CC
diff --git a/tests/ltcond.test b/tests/ltcond.test
index 1698d4c23..d5098ea9b 100755
--- a/tests/ltcond.test
+++ b/tests/ltcond.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([WANT_LIBFOO], [true])
AM_CONDITIONAL([WANT_LIBBAR], [false])
AC_SUBST([WANTEDLIBS], ['lib1foo.la lib1bar.la'])
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
index 405adf99b..4a7239483 100755
--- a/tests/ltcond2.test
+++ b/tests/ltcond2.test
@@ -19,7 +19,7 @@
required='cc native libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/ltconv.test b/tests/ltconv.test
index c5f7085d2..19ed8b34b 100755
--- a/tests/ltconv.test
+++ b/tests/ltconv.test
@@ -20,7 +20,7 @@
required='cc native libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 3ff25153a..100d045e9 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -19,7 +19,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_AR
AC_PROG_LIBTOOL
AC_PROG_CXX
diff --git a/tests/ltinit.test b/tests/ltinit.test
index 73af62e48..49ddbe0f8 100755
--- a/tests/ltinit.test
+++ b/tests/ltinit.test
@@ -21,7 +21,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
dnl Older libtool versions don't define LT_PREREQ :-(
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index 1263caa28..2879aa1d8 100755
--- a/tests/ltinstloc.test
+++ b/tests/ltinstloc.test
@@ -20,7 +20,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index a73019c36..5cdccf09b 100755
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -19,7 +19,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([LTLIBOBJS])
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index f68f459c2..11e2a1d56 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -19,7 +19,7 @@
required='cc libtool'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/ltorder.test b/tests/ltorder.test
index da834d783..358e620fe 100755
--- a/tests/ltorder.test
+++ b/tests/ltorder.test
@@ -19,7 +19,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/lzma.test b/tests/lzma.test
index 59dd545c0..8e78f8683 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -25,7 +25,7 @@ $ACLOCAL --force
AUTOMAKE_fails -Wnone -Wno-error
grep "^Makefile\\.am:1:.*$errmsg" stderr
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([lzma], [1.0])
AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
AC_CONFIG_FILES([Makefile])
@@ -36,6 +36,6 @@ END
rm -rf autom4te*.cache
$ACLOCAL
AUTOMAKE_fails -Wnone -Wno-error
-grep "^configure\\.in:2:.*$errmsg" stderr
+grep "^configure\\.ac:2:.*$errmsg" stderr
:
diff --git a/tests/m4-inclusion.test b/tests/m4-inclusion.test
index ddea64d11..7285e2886 100755
--- a/tests/m4-inclusion.test
+++ b/tests/m4-inclusion.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
sinclude([doesntexist.m4])
EOF
diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test
index 44c06ea6d..f5f50ed82 100755
--- a/tests/maintclean-vpath.test
+++ b/tests/maintclean-vpath.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/maintclean.test b/tests/maintclean.test
index d64f9a9d7..8bdc7d2c8 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/maintmode-configure-msg.test b/tests/maintmode-configure-msg.test
index 3cfbb7b7a..ac13afff4 100755
--- a/tests/maintmode-configure-msg.test
+++ b/tests/maintmode-configure-msg.test
@@ -24,11 +24,11 @@
set_maintmode ()
{
rm -rf autom4te*.cache # Just to be sure not to use a stale cache.
- echo "AC_INIT([$me], [1.0])" > configure.in
+ echo "AC_INIT([$me], [1.0])" > configure.ac
case $1 in
DEFAULT) echo AM_MAINTAINER_MODE;;
*) echo "AM_MAINTAINER_MODE([$*])";;
- esac >> configure.in
+ esac >> configure.ac
}
check_configure_message_with ()
diff --git a/tests/make-dryrun.tap b/tests/make-dryrun.tap
index e54ae0114..37692059b 100755
--- a/tests/make-dryrun.tap
+++ b/tests/make-dryrun.tap
@@ -29,7 +29,7 @@ fi
mkdir sub
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
all:
diff --git a/tests/make.test b/tests/make.test
index 42eae3c59..a6e568930 100755
--- a/tests/make.test
+++ b/tests/make.test
@@ -20,7 +20,7 @@
required=GNUmake
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAKE_INCLUDE
AC_OUTPUT
END
@@ -43,7 +43,7 @@ for flag in '' -w; do
MAKE="$save $flag" ./configure
$FGREP 'am__include = include' Makefile
$sleep
- touch configure.in
+ touch configure.ac
$MAKE $flag
$FGREP 'am__include = include' Makefile
rm -f config.cache
diff --git a/tests/makej.test b/tests/makej.test
index 6f41e238f..9144d83e2 100755
--- a/tests/makej.test
+++ b/tests/makej.test
@@ -24,7 +24,7 @@
required=GNUmake
. ./defs || Exit 1
-cat >configure.in <<END
+cat >configure.ac <<END
m4_include([version.m4])
AC_INIT([$me], [THE_VERSION])
AM_INIT_AUTOMAKE
diff --git a/tests/makej2.test b/tests/makej2.test
index 1b96e754d..746a2bd13 100755
--- a/tests/makej2.test
+++ b/tests/makej2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/maken.test b/tests/maken.test
index f74b805e1..d8077df91 100755
--- a/tests/maken.test
+++ b/tests/maken.test
@@ -23,7 +23,7 @@
mkdir sub
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/maken3.test b/tests/maken3.test
index 88cf30c7b..837b15b9b 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -43,7 +43,7 @@ fi
mkdir sub sub2
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
AC_OUTPUT
END
diff --git a/tests/man2.test b/tests/man2.test
index ec8627378..38c399288 100755
--- a/tests/man2.test
+++ b/tests/man2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/man3.test b/tests/man3.test
index 53a32c6e7..a842d38a9 100755
--- a/tests/man3.test
+++ b/tests/man3.test
@@ -24,7 +24,7 @@ installcheck-local:
grep bar "$(mandir)/man1/foo.1"
END
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
: ${foo=foo}
AC_SUBST([foo])
AC_CONFIG_FILES([foo.1])
diff --git a/tests/man4.test b/tests/man4.test
index d524355ca..895e0c5ce 100755
--- a/tests/man4.test
+++ b/tests/man4.test
@@ -42,7 +42,7 @@ bar.1:
$(HELP2MAN) --output=$(srcdir)/bar.1 $(srcdir)/bar
END
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_MISSING_PROG([HELP2MAN], [help2man])
AC_OUTPUT
END
diff --git a/tests/man5.test b/tests/man5.test
index bdd3d594c..674ea03c1 100755
--- a/tests/man5.test
+++ b/tests/man5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/man6.test b/tests/man6.test
index daf08421b..d6cece60c 100755
--- a/tests/man6.test
+++ b/tests/man6.test
@@ -35,7 +35,7 @@ zardoz.1:
$(HELP2MAN) --output=$(srcdir)/zardoz.1 $(srcdir)/zardoz
END
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AM_MISSING_PROG([HELP2MAN], [help2man])
AC_OUTPUT
END
diff --git a/tests/man7.test b/tests/man7.test
index b850228f6..37bec90ca 100755
--- a/tests/man7.test
+++ b/tests/man7.test
@@ -25,7 +25,7 @@ $(srcdir)/foo.1 bar.1:
MAINTAINERCLEANFILES = $(dist_man_MANS)
END
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/man8.test b/tests/man8.test
index bdc0febf7..14c190b0f 100755
--- a/tests/man8.test
+++ b/tests/man8.test
@@ -30,7 +30,7 @@ foo.1:
: > $(srcdir)/$@
END
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 393e92617..a37e60b79 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([foo])
AM_INIT_AUTOMAKE
diff --git a/tests/mdate4.test b/tests/mdate4.test
index c5ba431ae..ac1be3a38 100755
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
END
diff --git a/tests/missing-auxfile-stops-makefiles-creation.test b/tests/missing-auxfile-stops-makefiles-creation.test
index 1324ef9bc..d7080818d 100755
--- a/tests/missing-auxfile-stops-makefiles-creation.test
+++ b/tests/missing-auxfile-stops-makefiles-creation.test
@@ -19,14 +19,14 @@
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AM_PATH_PYTHON
END
echo SUBDIRS = > Makefile.am
for i in 1 2 3 4 5; do
- echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
+ echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
echo "SUBDIRS += sub$i" >> Makefile.am
mkdir sub$i
echo python_PYTHON = foo.py > sub$i/Makefile.am
diff --git a/tests/missing.test b/tests/missing.test
index 7055bca40..473d0412c 100755
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/missing2.test b/tests/missing2.test
index e9dc19b1f..89e9a5daf 100755
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
m4_include([v.m4])
AC_OUTPUT
EOF
diff --git a/tests/missing4.test b/tests/missing4.test
index 64018d15f..01321c349 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
touch Makefile.am
diff --git a/tests/missing5.test b/tests/missing5.test
index 20ecb8f21..e17b26747 100755
--- a/tests/missing5.test
+++ b/tests/missing5.test
@@ -26,7 +26,7 @@ get_shell_script missing
needed_tools='chmod find sed test touch'
needed_tools_csep=`echo $needed_tools | sed 's/ /, /g'`
-cat >configure.in <<EOF
+cat >configure.ac <<EOF
AC_INIT([missing4], [1.0])
m4_foreach([tool], [$needed_tools_csep],
[AC_PATH_PROG(tool, tool, [false])
diff --git a/tests/missing6.test b/tests/missing6.test
index cfc4840ac..8173f818a 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -16,24 +16,26 @@
# Make sure autoconf version checks in aclocal.m4 are robust.
+am_create_testdirs=empty
. ./defs || Exit 1
-{
- echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
- echo 'dnl!! m4_define([a], [oops])'
- cat configure.in
- echo AC_OUTPUT
-} >configure.ac
-rm -f configure.in
+cat > configure.ac <<END
+m4_define([AC_AUTOCONF_VERSION], [9999a])
+dnl!! m4_define([a], [oops])
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
-touch Makefile.am
+: > Makefile.am
$ACLOCAL
$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
grep 'You have another version of autoconf' stderr
grep 'aclocal.m4:.*this file was generated for' stderr
-$AUTOMAKE
+$AUTOMAKE -a
./configure
$MAKE
diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index a871305b3..658283600 100755
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-installman
diff --git a/tests/mmode.test b/tests/mmode.test
index 95b386d15..6c8039955 100755
--- a/tests/mmode.test
+++ b/tests/mmode.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
AC_OUTPUT
END
@@ -38,14 +38,14 @@ grep '^MAINT.*#' Makefile
./configure --enable-maintainer-mode
grep '^MAINT.*#' Makefile && Exit 1
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in > configure.int
-mv -f configure.int configure.in
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.int
+mv -f configure.int configure.ac
mv configure configure1
$AUTOCONF --force
diff configure configure1
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.in > configure.int
-mv -f configure.int configure.in
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.int
+mv -f configure.int configure.ac
$AUTOCONF --force
./configure
@@ -57,8 +57,8 @@ grep '^MAINT.*#' Makefile && Exit 1
./configure --disable-maintainer-mode
grep '^MAINT.*#' Makefile
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.in > configure.int
-mv -f configure.int configure.in
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.ac > configure.int
+mv -f configure.int configure.ac
$AUTOCONF --force -Werror && Exit 1
:
diff --git a/tests/mmodely.test b/tests/mmodely.test
index 0eb352ba6..6c6191520 100755
--- a/tests/mmodely.test
+++ b/tests/mmodely.test
@@ -21,7 +21,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
AC_PROG_CC
AM_PROG_LEX
diff --git a/tests/multlib.test b/tests/multlib.test
index e616ece8d..b7ddf200e 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -30,7 +30,7 @@ cp "$mldir"/multi.m4 m4
ACLOCAL_PATH=${ACLOCAL_PATH+"$ACLOCAL_PATH:"}`pwd`/m4
export ACLOCAL_PATH
-cat >configure.in <<'END'
+cat >configure.ac <<'END'
AC_INIT([multlib], [1.0])
AC_CONFIG_SRCDIR(libfoo/foo.c)
AC_CONFIG_AUX_DIR(.)
@@ -71,7 +71,7 @@ EOF
mkdir libfoo
cp "$mldir"/multilib.am libfoo/
-cat >libfoo/configure.in <<'END'
+cat >libfoo/configure.ac <<'END'
AC_PREREQ(2.57)
AC_INIT(libfoo, 0.1, nobody@localhost)
AC_CONFIG_SRCDIR(foo.c)
@@ -98,7 +98,7 @@ END
mkdir libbar
cp "$mldir"/multilib.am libbar/
-cat >libbar/configure.in <<'END'
+cat >libbar/configure.ac <<'END'
AC_PREREQ(2.57)
AC_INIT(libbar, 0.1, nobody@localhost)
# Apparently it doesn't work to have auxdir=.. when
diff --git a/tests/no-extra-makefile-code.test b/tests/no-extra-makefile-code.test
index d0b18fb4b..1742dc433 100755
--- a/tests/no-extra-makefile-code.test
+++ b/tests/no-extra-makefile-code.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
: > Makefile.am
diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test
index 4e8ddfaa0..38008cd0a 100755
--- a/tests/nobase-libtool.test
+++ b/tests/nobase-libtool.test
@@ -21,7 +21,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/nobase-nodist.test b/tests/nobase-nodist.test
index 01d5c1160..d4ae44acc 100755
--- a/tests/nobase-nodist.test
+++ b/tests/nobase-nodist.test
@@ -21,7 +21,7 @@
# Simulate no emacs and no python (it shouldn't be needed in this test).
EMACS="no" PYTHON=":"; export EMCAS PYTHON
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PATH_LISPDIR
AM_PATH_PYTHON([], [], [:])
# Simulate no javac (it shouldn't be needed in this test).
diff --git a/tests/nobase-python.test b/tests/nobase-python.test
index 9863fff58..28509018b 100755
--- a/tests/nobase-python.test
+++ b/tests/nobase-python.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_PATH_PYTHON
AC_OUTPUT
EOF
diff --git a/tests/nobase.test b/tests/nobase.test
index 4bbaee5ce..e7661c09a 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/nodef.test b/tests/nodef.test
index 9f8df0b29..3c55745b3 100755
--- a/tests/nodef.test
+++ b/tests/nodef.test
@@ -27,7 +27,7 @@
# First, check that PACKAGE and VERSION are output by default.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
AC_OUTPUT(output)
@@ -43,7 +43,7 @@ grep 'DEFS.*-DVERSION=\\"UnIqUe' output
# Then, check that PACKAGE and VERSION are not output if requested.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN], [no])
AC_OUTPUT(output)
diff --git a/tests/nodef2.test b/tests/nodef2.test
index 8190ebee3..965a915ef 100755
--- a/tests/nodef2.test
+++ b/tests/nodef2.test
@@ -20,7 +20,7 @@
# First, check that PACKAGE and VERSION are output by default.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
AM_INIT_AUTOMAKE
AC_OUTPUT(output)
@@ -36,7 +36,7 @@ grep 'DEFS.*-DVERSION=\\"UnIqUe' output
# Then, check that PACKAGE and VERSION are not output if requested.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN])
AM_INIT_AUTOMAKE([no-define])
AC_OUTPUT(output Makefile)
diff --git a/tests/nodep.test b/tests/nodep.test
index b87c2ac8b..5dcad1ce9 100755
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -25,7 +25,7 @@ bin_PROGRAMS = zardoz
zardoz_SOURCES = y.c
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/nodep2.test b/tests/nodep2.test
index a79d698e2..edf0fa9da 100755
--- a/tests/nodep2.test
+++ b/tests/nodep2.test
@@ -23,7 +23,7 @@ bin_PROGRAMS = foo
foo_SOURCES = a.c b.cpp c.m d.S e.java f.upc
END
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([nodep2], [1], [bug-automake@gnu.org])
AM_INIT_AUTOMAKE([no-dependencies])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/nodist.test b/tests/nodist.test
index 6636e911b..92cc2f75a 100755
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/nodist2.test b/tests/nodist2.test
index 3c6e8c7cd..36851be90 100755
--- a/tests/nodist2.test
+++ b/tests/nodist2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_OUTPUT
EOF
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 59a672798..23becc12d 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 9b3d8f627..39abdc7e2 100755
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -32,7 +32,7 @@ check_PROGRAMS = bar
check_HEADERS = bar.h
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 3230b2dba..868c0d990 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/notrans.test b/tests/notrans.test
index e524f7dba..487b66f3d 100755
--- a/tests/notrans.test
+++ b/tests/notrans.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/number.test b/tests/number.test
index fb6b45538..b96e1180d 100755
--- a/tests/number.test
+++ b/tests/number.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/objc.test b/tests/objc.test
index 8f74b7847..d0e7bf06e 100755
--- a/tests/objc.test
+++ b/tests/objc.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_OBJC
END
diff --git a/tests/objc2.test b/tests/objc2.test
index 4864f8ea2..290bf2642 100755
--- a/tests/objc2.test
+++ b/tests/objc2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >>configure.in
+echo AC_PROG_CC >>configure.ac
cat >Makefile.am <<'END'
bin_PROGRAMS = hello
diff --git a/tests/objext-pr10128.test b/tests/objext-pr10128.test
index e1056357b..2fe2dfd2c 100755
--- a/tests/objext-pr10128.test
+++ b/tests/objext-pr10128.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
LINK = echo >$@ Linked $@ from
diff --git a/tests/obsolete.test b/tests/obsolete.test
index 00cbdaecc..c4240c200 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -22,24 +22,24 @@ set x ${AUTOUPDATE-autoupdate}
required=$2
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
END
$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
"$am_automake_acdir/obsolete.m4" > obs
-cat obs >> configure.in
+cat obs >> configure.ac
$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
-$PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2
+$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2
echo : >> obs.1 # Since it will be sourced, it must end with a success.
echo : >> obs.2 # Likewise.
-cat configure.in # For debugging.
+cat configure.ac # For debugging.
cat obs.1 # Likewise.
cat obs.2 # Likewise.
-# Sanity check. Make sure we have added something to configure.in.
-test `wc -l <configure.in` -gt 1
+# Sanity check. Make sure we have added something to configure.ac.
+test `wc -l <configure.ac` -gt 1
$ACLOCAL
@@ -51,7 +51,7 @@ cat output
$AUTOUPDATE
. ./obs.2
-# Autoconf should be able to grok the updated configure.in.
+# Autoconf should be able to grok the updated configure.ac.
$AUTOCONF
:
diff --git a/tests/order.test b/tests/order.test
index 2dbee35da..238340346 100755
--- a/tests/order.test
+++ b/tests/order.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
jm_TEST
FOO
END
diff --git a/tests/output-order.test b/tests/output-order.test
index f260672b5..f242a5138 100755
--- a/tests/output-order.test
+++ b/tests/output-order.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/output.test b/tests/output.test
index e241b1d91..faf877ba5 100755
--- a/tests/output.test
+++ b/tests/output.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([Makefile frob/zardoz])
diff --git a/tests/output10.test b/tests/output10.test
index 904e2bf25..92492f692 100755
--- a/tests/output10.test
+++ b/tests/output10.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << END
+cat >> configure.ac << END
AC_SUBST([FOO], [top])
AC_SUBST([BAR], [bot])
AC_CONFIG_FILES([a/top])
diff --git a/tests/output11.test b/tests/output11.test
index 8291fa54d..4413f9732 100755
--- a/tests/output11.test
+++ b/tests/output11.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << \END
+cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
file1=this.in
echo @FOO@ >$file1
diff --git a/tests/output12.test b/tests/output12.test
index 11a8f36af..a3693cc29 100755
--- a/tests/output12.test
+++ b/tests/output12.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << \END
+cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
AC_SUBST([file1], [this.in])
echo @FOO@ >$file1
diff --git a/tests/output13.test b/tests/output13.test
index 21fd4fefb..53d914d33 100755
--- a/tests/output13.test
+++ b/tests/output13.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << \END
+cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
if $create; then
AC_CONFIG_FILES([file])
diff --git a/tests/output2.test b/tests/output2.test
index e7614daf5..41c81bfe7 100755
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([Makefile intl/intlh.inst po/Makefile.in misc/gettextize])
diff --git a/tests/output3.test b/tests/output3.test
index 30df4539a..dd7aaefe7 100755
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([Makefile
diff --git a/tests/output4.test b/tests/output4.test
index f4ee14565..fa6a95ea5 100755
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_OUTPUT([tests/Makefile tests/defs])
diff --git a/tests/output5.test b/tests/output5.test
index 4915370eb..8bf9403a2 100755
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([foo], [bar], [baz])
AM_INIT_AUTOMAKE
AC_OUTPUT
diff --git a/tests/output6.test b/tests/output6.test
index c363ebdd5..b55f5e327 100755
--- a/tests/output6.test
+++ b/tests/output6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([foo:a.in:b.in:c.in:d.in])
diff --git a/tests/output7.test b/tests/output7.test
index dc9752ea0..57ff35a5c 100755
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([
diff --git a/tests/output8.test b/tests/output8.test
index a90280bd3..75d711080 100755
--- a/tests/output8.test
+++ b/tests/output8.test
@@ -22,8 +22,8 @@
mkdir testdir
cd testdir
-mv ../configure.in .
-cat >> configure.in << END
+mv ../configure.ac .
+cat >> configure.ac << END
AC_CONFIG_FILES([a/foo.sh:../testdir/a/foo.sh.in])
AC_CONFIG_FILES([a/Makefile])
AC_OUTPUT
diff --git a/tests/output9.test b/tests/output9.test
index 10c30ce81..f0759108c 100755
--- a/tests/output9.test
+++ b/tests/output9.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << END
+cat >> configure.ac << END
AC_CONFIG_FILES([a/mid.in:a/input.in.in])
AC_CONFIG_FILES([b/out:a/mid.in])
AC_CONFIG_FILES([a/Makefile b/Makefile])
diff --git a/tests/override-conditional-1.test b/tests/override-conditional-1.test
index 1f7b550fe..1f66d3f47 100755
--- a/tests/override-conditional-1.test
+++ b/tests/override-conditional-1.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
AC_OUTPUT
END
diff --git a/tests/override-conditional-2.test b/tests/override-conditional-2.test
index acaa497c6..4f0688832 100755
--- a/tests/override-conditional-2.test
+++ b/tests/override-conditional-2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [:])
END
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index b73f0f8a0..db184b283 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -38,7 +38,7 @@
required=perl-threads
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([parallel-am], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
@@ -54,7 +54,7 @@ END
list='1 2 3 4 5 6 7 8 9'
for i in $list; do
- echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
+ echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
echo "SUBDIRS += sub$i" >> Makefile.am
mkdir sub$i
echo > sub$i/Makefile.am
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
index 3d8f9876e..a8ee1b955 100755
--- a/tests/parallel-am2.test
+++ b/tests/parallel-am2.test
@@ -34,7 +34,7 @@ END
list='1 2 3'
for i in $list; do
- echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
+ echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
echo "SUBDIRS += sub$i" >> Makefile.am
mkdir sub$i sub$i/sub
unindent > sub$i/Makefile.am << END
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index dba339719..d6302907e 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -24,7 +24,7 @@
required=perl-threads
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([parallel-am], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
@@ -40,7 +40,7 @@ END
list='1 2 3'
for i in $list; do
- echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.in
+ echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
echo "SUBDIRS += sub$i" >> Makefile.am
mkdir sub$i
unindent > sub$i/Makefile.am <<END
diff --git a/tests/parallel-tests-cmdline-override.test b/tests/parallel-tests-cmdline-override.test
index 2e7918d4e..86b0c94ef 100755
--- a/tests/parallel-tests-cmdline-override.test
+++ b/tests/parallel-tests-cmdline-override.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-console-output.test b/tests/parallel-tests-console-output.test
index a25b405d9..ac43b2537 100755
--- a/tests/parallel-tests-console-output.test
+++ b/tests/parallel-tests-console-output.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-driver-install.test b/tests/parallel-tests-driver-install.test
index 012602d6e..b538799e0 100755
--- a/tests/parallel-tests-driver-install.test
+++ b/tests/parallel-tests-driver-install.test
@@ -25,7 +25,7 @@ am_parallel_tests=yes
mkdir am-init-automake
cd am-init-automake
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([my_aux_dir])
AM_INIT_AUTOMAKE([parallel-tests])
@@ -53,7 +53,7 @@ test -f my_aux_dir/test-driver
test ! -r test-driver
test ! -r sub/test-driver
-grep '^configure\.in:3:.*installing.*my_aux_dir/test-driver' stderr
+grep '^configure\.ac:3:.*installing.*my_aux_dir/test-driver' stderr
cd ..
@@ -62,7 +62,7 @@ cd ..
mkdir automake-options
cd automake-options
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
diff --git a/tests/parallel-tests-dry-run-1.test b/tests/parallel-tests-dry-run-1.test
index 27e62a080..b094c1841 100755
--- a/tests/parallel-tests-dry-run-1.test
+++ b/tests/parallel-tests-dry-run-1.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
TESTS = foo.test bar.test
diff --git a/tests/parallel-tests-dry-run-2.test b/tests/parallel-tests-dry-run-2.test
index 6cf1c23cc..0d13677c2 100755
--- a/tests/parallel-tests-dry-run-2.test
+++ b/tests/parallel-tests-dry-run-2.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-empty-testlogs.test b/tests/parallel-tests-empty-testlogs.test
index 608299f8f..0ea6db837 100755
--- a/tests/parallel-tests-empty-testlogs.test
+++ b/tests/parallel-tests-empty-testlogs.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_OUTPUT
END
diff --git a/tests/parallel-tests-exeext.test b/tests/parallel-tests-exeext.test
index 05836fffb..e93f5f10d 100755
--- a/tests/parallel-tests-exeext.test
+++ b/tests/parallel-tests-exeext.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl We need to fool the init.m4 internals a little.
AC_DEFUN([_AM_FOO],
[m4_provide([_AM_COMPILER_EXEEXT])
diff --git a/tests/parallel-tests-exit-statuses.test b/tests/parallel-tests-exit-statuses.test
index 042dbdb65..688ff8447 100755
--- a/tests/parallel-tests-exit-statuses.test
+++ b/tests/parallel-tests-exit-statuses.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-extra-programs.test b/tests/parallel-tests-extra-programs.test
index 5b1a58e1f..55f0a4c73 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -21,7 +21,7 @@ required='cc native'
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/parallel-tests-fd-redirect-exeext.test b/tests/parallel-tests-fd-redirect-exeext.test
index 09d6297a5..46e0b66f0 100755
--- a/tests/parallel-tests-fd-redirect-exeext.test
+++ b/tests/parallel-tests-fd-redirect-exeext.test
@@ -25,7 +25,7 @@ required='cc native'
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
# Calls like "write(9, ...)" are unlikely to work for MinGW-compiled
# programs. We must skip this test if this is the case.
diff --git a/tests/parallel-tests-fd-redirect.test b/tests/parallel-tests-fd-redirect.test
index 4af48da44..90b44ae43 100755
--- a/tests/parallel-tests-fd-redirect.test
+++ b/tests/parallel-tests-fd-redirect.test
@@ -23,7 +23,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-fork-bomb.test b/tests/parallel-tests-fork-bomb.test
index e457698e1..d992d63a1 100755
--- a/tests/parallel-tests-fork-bomb.test
+++ b/tests/parallel-tests-fork-bomb.test
@@ -77,7 +77,7 @@ else
cond=false
fi
-cat >> configure.in << END
+cat >> configure.ac << END
AM_CONDITIONAL([IS_GNU_MAKE], [$cond])
AC_OUTPUT
END
diff --git a/tests/parallel-tests-harderror.test b/tests/parallel-tests-harderror.test
index 3f09d9d18..14256ff22 100755
--- a/tests/parallel-tests-harderror.test
+++ b/tests/parallel-tests-harderror.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/parallel-tests-interrupt.tap b/tests/parallel-tests-interrupt.tap
index 795b01ddc..39a04a753 100755
--- a/tests/parallel-tests-interrupt.tap
+++ b/tests/parallel-tests-interrupt.tap
@@ -24,7 +24,7 @@ am_parallel_tests=yes
plan_ 16
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-log-compiler-1.test b/tests/parallel-tests-log-compiler-1.test
index 7b1b7c66e..e319c9e29 100755
--- a/tests/parallel-tests-log-compiler-1.test
+++ b/tests/parallel-tests-log-compiler-1.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([acsubst_compiler], [t-compiler])
AC_CONFIG_LINKS([chk-compiler:chk-compiler])
AC_OUTPUT
diff --git a/tests/parallel-tests-log-compiler-2.test b/tests/parallel-tests-log-compiler-2.test
index c3825a16d..7443e263f 100755
--- a/tests/parallel-tests-log-compiler-2.test
+++ b/tests/parallel-tests-log-compiler-2.test
@@ -23,7 +23,7 @@ am_parallel_tests=yes
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/parallel-tests-log-compiler-example.test b/tests/parallel-tests-log-compiler-example.test
index a043c5d00..8b4575861 100755
--- a/tests/parallel-tests-log-compiler-example.test
+++ b/tests/parallel-tests-log-compiler-example.test
@@ -21,7 +21,7 @@ am_parallel_tests=yes
required=python
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_SUBST([PERL], ['$PERL'])
AM_PATH_PYTHON
AC_OUTPUT
diff --git a/tests/parallel-tests-log-override-1.test b/tests/parallel-tests-log-override-1.test
index a0ac5a56f..76bedba63 100755
--- a/tests/parallel-tests-log-override-1.test
+++ b/tests/parallel-tests-log-override-1.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-log-override-2.test b/tests/parallel-tests-log-override-2.test
index af965465b..ca0b59fbb 100755
--- a/tests/parallel-tests-log-override-2.test
+++ b/tests/parallel-tests-log-override-2.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-log-override-recheck.test b/tests/parallel-tests-log-override-recheck.test
index cf4a163f8..c7c1b2b39 100755
--- a/tests/parallel-tests-log-override-recheck.test
+++ b/tests/parallel-tests-log-override-recheck.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-many.test b/tests/parallel-tests-many.test
index 0f2d73209..d14b09e9e 100755
--- a/tests/parallel-tests-many.test
+++ b/tests/parallel-tests-many.test
@@ -23,7 +23,7 @@ am_parallel_tests=yes
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-no-color-in-log.test b/tests/parallel-tests-no-color-in-log.test
index 2b696d47a..17115b943 100755
--- a/tests/parallel-tests-no-color-in-log.test
+++ b/tests/parallel-tests-no-color-in-log.test
@@ -32,7 +32,7 @@ esac
TERM=ansi; export TERM
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/parallel-tests-no-spurious-summary.test b/tests/parallel-tests-no-spurious-summary.test
index 4a9fd2328..ce33c7b48 100755
--- a/tests/parallel-tests-no-spurious-summary.test
+++ b/tests/parallel-tests-no-spurious-summary.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-once.test b/tests/parallel-tests-once.test
index 0a7360db9..4962ecdd6 100755
--- a/tests/parallel-tests-once.test
+++ b/tests/parallel-tests-once.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-reset-term.test b/tests/parallel-tests-reset-term.test
index eab2948de..6307f6e4b 100755
--- a/tests/parallel-tests-reset-term.test
+++ b/tests/parallel-tests-reset-term.test
@@ -30,7 +30,7 @@ case `echo "$esc" | $FGREP "$esc"` in
*) skip_ "$FGREP can't parse nonprinting characters" ;;
esac
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-subdir.test b/tests/parallel-tests-subdir.test
index 7e7e031a4..6848edbd8 100755
--- a/tests/parallel-tests-subdir.test
+++ b/tests/parallel-tests-subdir.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-suffix-prog.test b/tests/parallel-tests-suffix-prog.test
index 10438a7d0..abd4a5c42 100755
--- a/tests/parallel-tests-suffix-prog.test
+++ b/tests/parallel-tests-suffix-prog.test
@@ -22,7 +22,7 @@ am_parallel_tests=yes
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/parallel-tests-suffix.test b/tests/parallel-tests-suffix.test
index 826bb8140..bd72d0d57 100755
--- a/tests/parallel-tests-suffix.test
+++ b/tests/parallel-tests-suffix.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests-trailing-bslash.test b/tests/parallel-tests-trailing-bslash.test
index 418b7222b..129c5a14c 100755
--- a/tests/parallel-tests-trailing-bslash.test
+++ b/tests/parallel-tests-trailing-bslash.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
TESTS = foo.test
diff --git a/tests/parallel-tests-unreadable.test b/tests/parallel-tests-unreadable.test
index 2bb505952..1750e26f4 100755
--- a/tests/parallel-tests-unreadable.test
+++ b/tests/parallel-tests-unreadable.test
@@ -24,7 +24,7 @@ am_parallel_tests=yes
chmod a-r t && test ! -r t || skip_ "you can still read unreadable files"
rm -f t
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index d6076f20d..891d7bd80 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -26,7 +26,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests10.test b/tests/parallel-tests10.test
index 2f2cae4f4..322767a1a 100755
--- a/tests/parallel-tests10.test
+++ b/tests/parallel-tests10.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index a5a3fc058..7b6933a5d 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -39,7 +39,7 @@ unset r2h
cp "$top_testsrcdir"/contrib/check-html.am . \
|| fatal_ "cannot fetch 'check-html.am' from contrib"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index b37cf0ad4..b550b7b6b 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -45,7 +45,7 @@ END
rm -f one output Makefile
fi
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index c0543297d..9f0a9669e 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -24,7 +24,7 @@ am_parallel_tests=yes
required='cc native GNUmake'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index be7e67f04..fb908e2b1 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index e214688cb..fb06a30e3 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -27,7 +27,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index 6c47f7335..f22be8d73 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/parse.test b/tests/parse.test
index 37f21f9e8..20ac2fedc 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/percent.test b/tests/percent.test
index f9da113d4..bdba44ede 100755
--- a/tests/percent.test
+++ b/tests/percent.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
EOF
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index 3c569c1ba..e9ce944a0 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AM_CONDITIONAL([A], [true])
AM_CONDITIONAL([B], [false])
AC_OUTPUT
diff --git a/tests/pluseq11.test b/tests/pluseq11.test
index 7da9b4ff8..0090df0e8 100755
--- a/tests/pluseq11.test
+++ b/tests/pluseq11.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 418bf90e2..d5a3fd95c 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
END
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 40ba82c51..4085a4640 100755
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
END
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 3d8e63cf8..e95ed8531 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 52661747a..f8ffa000b 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
END
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index f41ae519a..971ed0382 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([ZZZ])
END
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index 7650f6855..6136dbe12 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
END
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 20c5ff8cc..f127a6ffa 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
AM_CONDITIONAL([COND3], [true])
diff --git a/tests/posixsubst-data.test b/tests/posixsubst-data.test
index 5670ddc92..d1630493e 100755
--- a/tests/posixsubst-data.test
+++ b/tests/posixsubst-data.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/posixsubst-extradist.test b/tests/posixsubst-extradist.test
index 2f8b21bf9..216a8c914 100755
--- a/tests/posixsubst-extradist.test
+++ b/tests/posixsubst-extradist.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/posixsubst-ldadd.test b/tests/posixsubst-ldadd.test
index 6287c1ee8..247789e71 100755
--- a/tests/posixsubst-ldadd.test
+++ b/tests/posixsubst-ldadd.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AM_PROG_AR
diff --git a/tests/posixsubst-libraries.test b/tests/posixsubst-libraries.test
index 0ade779ed..01edcbb98 100755
--- a/tests/posixsubst-libraries.test
+++ b/tests/posixsubst-libraries.test
@@ -21,7 +21,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AM_PROG_AR
diff --git a/tests/posixsubst-ltlibraries.test b/tests/posixsubst-ltlibraries.test
index 9da7aeb83..d96770900 100755
--- a/tests/posixsubst-ltlibraries.test
+++ b/tests/posixsubst-ltlibraries.test
@@ -21,7 +21,7 @@
required='cc libtool libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/posixsubst-programs.test b/tests/posixsubst-programs.test
index 0328a10c2..29f08dddc 100755
--- a/tests/posixsubst-programs.test
+++ b/tests/posixsubst-programs.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/posixsubst-scripts.test b/tests/posixsubst-scripts.test
index f6e1b142f..f6c31b3ad 100755
--- a/tests/posixsubst-scripts.test
+++ b/tests/posixsubst-scripts.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/posixsubst-sources.test b/tests/posixsubst-sources.test
index 0edec08d2..4c7b7408c 100755
--- a/tests/posixsubst-sources.test
+++ b/tests/posixsubst-sources.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/posixsubst-tests.test b/tests/posixsubst-tests.test
index bed12ad1e..9b00b28eb 100755
--- a/tests/posixsubst-tests.test
+++ b/tests/posixsubst-tests.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/postproc.test b/tests/postproc.test
index 7b3702dc4..7eaa4f871 100755
--- a/tests/postproc.test
+++ b/tests/postproc.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >configure.in <<END
+cat >configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_PROG_CC
diff --git a/tests/ppf77.test b/tests/ppf77.test
index fe439a7aa..70266d639 100755
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_F77
END
diff --git a/tests/pr2.test b/tests/pr2.test
index 026d0c40a..ffe4a81d7 100755
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -18,7 +18,7 @@
# "make dist" fails for AC_OUTPUT(README.foo:templ/README.foo.in).
#
# == Report ==
-# When my AC_OUTPUT macro in configure.in contains something
+# When my AC_OUTPUT macro in configure.ac contains something
# like the following (among the Makefiles)
# README.foo:templ/README.foo.in
# the generated dist target in the Makefile.in fails,
@@ -30,7 +30,7 @@
. ./defs || Exit 1
# Please keep this underquoted and old-style.
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_OUTPUT(README.foo:templ/README.foo.in Makefile)
diff --git a/tests/pr211.test b/tests/pr211.test
index 0c6248161..6cb445e77 100755
--- a/tests/pr211.test
+++ b/tests/pr211.test
@@ -30,7 +30,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/pr220.test b/tests/pr220.test
index 4c5b91cc8..657221d2f 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -31,7 +31,7 @@ endif
data_DATA = $(NEVER_DEFINED)
EOF
-cat >> configure.in << 'EOF'
+cat >> configure.ac << 'EOF'
AC_ARG_ENABLE([foo],
[ --enable-foo Enable foo],
[ if test "foo" = "bar" ; then
diff --git a/tests/pr224.test b/tests/pr224.test
index db96161d4..265a45bae 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -41,7 +41,7 @@ bin_PROGRAMS = bar
bar_SOURCES = foo/main.c
EOF
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/pr229.test b/tests/pr229.test
index 023b6a6cc..cacdb824a 100755
--- a/tests/pr229.test
+++ b/tests/pr229.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<EOF
+cat >> configure.ac <<EOF
AC_CYGWIN
EOF
diff --git a/tests/pr243.test b/tests/pr243.test
index 6fdd697bc..e2586a598 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -19,7 +19,7 @@
# `Makefile:Makefile.in:tail.mk' in AC_OUTPUT.
#
# == Report ==
-# If configure.in has something like:
+# If configure.ac has something like:
# AC_OUTPUT(Makefile:Makefile.in:tail.mk)
# then config.status cannot parse the Makefile to build the
# dependency files in the .deps directory. This is because
@@ -29,7 +29,7 @@
required=cc
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_PROG_CC
diff --git a/tests/pr266.test b/tests/pr266.test
index 4e9484f81..ac5687894 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_PROG_CC
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index da271ec62..5618d7625 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -26,7 +26,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([FOOTEST], [false])
AC_OUTPUT
diff --git a/tests/pr279.test b/tests/pr279.test
index dd5961c6f..338313184 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -26,7 +26,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([FOOTEST], [false])
AC_OUTPUT
diff --git a/tests/pr287.test b/tests/pr287.test
index 576abeb42..681f6d61b 100755
--- a/tests/pr287.test
+++ b/tests/pr287.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index 674566905..9f9791f3b 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AC_PROG_CC
AC_OUTPUT
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index df9c2295b..09ae8700f 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -20,7 +20,7 @@
required='cc libtoolize'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
index 0f1c074a4..6812231bd 100755
--- a/tests/pr300-prog.test
+++ b/tests/pr300-prog.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/pr307.test b/tests/pr307.test
index f6994cd81..b1af312b5 100755
--- a/tests/pr307.test
+++ b/tests/pr307.test
@@ -35,7 +35,7 @@
required='libtoolize gcc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/pr401.test b/tests/pr401.test
index 3ae991d6d..965278631 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -42,7 +42,7 @@ int main (void)
}
EOF
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
## These lines are activated for later tests
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
@@ -91,8 +91,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
$ACLOCAL
$AUTOCONF
@@ -116,8 +116,8 @@ mv -f src/t src/Makefile.am
## Test using LIBOBJS from a sibling directory. ##
## -------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -153,8 +153,8 @@ $MAKE distclean
## Test using LIBOBJS from parent directory. ##
## ----------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/tests/pr401b.test b/tests/pr401b.test
index 0195a0098..756786612 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -42,7 +42,7 @@ int main (void)
}
EOF
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
## These lines are activated for later tests
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
@@ -92,8 +92,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
$ACLOCAL
$AUTOCONF
@@ -116,8 +116,8 @@ mv -f src/t src/Makefile.am
## Test using LTLIBOBJS from a sibling directory. ##
## ---------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -153,8 +153,8 @@ $MAKE distclean
## Test using LTLIBOBJS from parent directory. ##
## ------------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/tests/pr401c.test b/tests/pr401c.test
index 75b516f91..50b263372 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -45,7 +45,7 @@ int main (void)
}
EOF
-cat >>configure.in << 'EOF'
+cat >>configure.ac << 'EOF'
## These lines are activated for later tests.
#: AC_CONFIG_LIBOBJ_DIR([lib])
AC_PROG_CC
@@ -94,8 +94,8 @@ $MAKE distcheck
# Invocation of AC_CONFIG_LIBOBJ_DIR may be necessary for reasons
# unrelated to Automake or Makefile.am layout.
-sed 's/#: //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#: //' configure.ac >configure.int
+mv -f configure.int configure.ac
$ACLOCAL
$AUTOCONF
@@ -119,8 +119,8 @@ mv -f src/t src/Makefile.am
## Test using ALLOCA from a sibling directory. ##
## ------------------------------------------- ##
-sed 's/#x //; s/lib\/Makefile //' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/#x //; s/lib\/Makefile //' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
SUBDIRS = src
@@ -156,8 +156,8 @@ $MAKE distclean
## Test using ALLOCA from parent directory. ##
## ---------------------------------------- ##
-sed 's/^.*src\/Makefile.*$//' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/^.*src\/Makefile.*$//' configure.ac >configure.int
+mv -f configure.int configure.ac
cat >Makefile.am <<'EOF'
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/tests/pr72.test b/tests/pr72.test
index 02d07877d..b16e8792f 100755
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -20,7 +20,7 @@
required=libtool
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
END
diff --git a/tests/pr8365-remake-timing.test b/tests/pr8365-remake-timing.test
index d04168d4a..2feaf6df2 100755
--- a/tests/pr8365-remake-timing.test
+++ b/tests/pr8365-remake-timing.test
@@ -27,7 +27,7 @@
# We'll use calls to stat to get debugging information.
if stat /dev/null; then stat=stat; else stat=:; fi
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
FOOBAR=zardoz
AC_OUTPUT
END
@@ -45,7 +45,7 @@ $MAKE Makefile
# Sanity check.
$EGREP 'FOOBAR|zardoz' Makefile && fatal_ 'unexpected AC_SUBST in Makefile'
-echo 'AC_SUBST([FOOBAR])' >> configure.in
+echo 'AC_SUBST([FOOBAR])' >> configure.ac
# Modified configure dependencies must have the same timestamp of
# config.status and Makefile in order to trigger the bug.
@@ -54,11 +54,11 @@ echo 'AC_SUBST([FOOBAR])' >> configure.in
# autoconf manual). Finally, we also sleep before touching, to ensure
# that the (possibly truncated) timestamps of config.status etc. are
# strictly newer than the non-truncated configure timestamp.
-$stat config.status Makefile configure.in
+$stat config.status Makefile configure.ac
$sleep
touch config.status
-touch -r config.status config.status Makefile configure.in
-$stat config.status Makefile configure.in
+touch -r config.status config.status Makefile configure.ac
+$stat config.status Makefile configure.ac
# Also, the race condition is triggered only when aclocal, automake
# and aclocal run fast enough to keep the timestamp of the generated
@@ -70,7 +70,7 @@ cat > aclocal-wrap <<END
#!/bin/sh
set -ex
# aclocal shouldn't use our autoconf wrapper when extracting
-# the races from configure.in.
+# the races from configure.ac.
AUTOCONF='$AUTOCONF'; export AUTOCONF
$ACLOCAL "\$@"
touch -r config.status aclocal.m4
@@ -81,7 +81,7 @@ cat > automake-wrap <<END
#!/bin/sh
set -ex
# automake shouldn't use our autoconf wrapper when extracting
-# the races from configure.in.
+# the races from configure.ac.
AUTOCONF='$AUTOCONF'; export AUTOCONF
$AUTOMAKE "\$@"
touch -r config.status Makefile.in
diff --git a/tests/pr87.test b/tests/pr87.test
index 58cdfd2f6..a0c7ac531 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -37,7 +37,7 @@ EOF
done
echo "SUBDIRS = $subdirs" > Makefile.am
-cat >configure.in <<EOF
+cat >configure.ac <<EOF
AC_INIT(`echo $subdirs | sed 's|\([a-z][a-z]*\).*|\1/\1.c|'`)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE($me, 1.0)
diff --git a/tests/pr9.test b/tests/pr9.test
index f4c8c26e1..f1df402f7 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -25,7 +25,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([support])
AM_INIT_AUTOMAKE
diff --git a/tests/prefix.test b/tests/prefix.test
index 5b43f76c3..26c088a0e 100755
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/primary-prefix-couples-documented-valid.test b/tests/primary-prefix-couples-documented-valid.test
index c80afcdef..7b0021abb 100755
--- a/tests/primary-prefix-couples-documented-valid.test
+++ b/tests/primary-prefix-couples-documented-valid.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/primary-prefix-couples-force-valid.test b/tests/primary-prefix-couples-force-valid.test
index db2594db8..064db2bbb 100755
--- a/tests/primary-prefix-couples-force-valid.test
+++ b/tests/primary-prefix-couples-force-valid.test
@@ -26,7 +26,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/primary-prefix-invalid-couples.tap b/tests/primary-prefix-invalid-couples.tap
index 3747f3b68..d957b1fda 100755
--- a/tests/primary-prefix-invalid-couples.tap
+++ b/tests/primary-prefix-invalid-couples.tap
@@ -34,7 +34,7 @@ oIFS=$IFS # Saved for later.
: > config.guess
: > config.sub
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
index a345c21b5..1b1e89bbd 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/primary2.test b/tests/primary2.test
index 1298c782b..f9417d8f3 100755
--- a/tests/primary2.test
+++ b/tests/primary2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = @programs@
diff --git a/tests/primary3.test b/tests/primary3.test
index a6b899504..ba34b575d 100755
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AC_OUTPUT
EOF
diff --git a/tests/programs-primary-rewritten.test b/tests/programs-primary-rewritten.test
index 65c432e35..7e1bd0b1f 100755
--- a/tests/programs-primary-rewritten.test
+++ b/tests/programs-primary-rewritten.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([FOO], [c])
AC_OUTPUT
END
diff --git a/tests/python-dist.test b/tests/python-dist.test
index 6740df6a8..25dd4fe8b 100755
--- a/tests/python-dist.test
+++ b/tests/python-dist.test
@@ -19,7 +19,7 @@
# This test does not require python.
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PATH_PYTHON([], [:], [:])
AC_OUTPUT
END
diff --git a/tests/python-vars.test b/tests/python-vars.test
index 53e2620fb..ff4d13ef2 100755
--- a/tests/python-vars.test
+++ b/tests/python-vars.test
@@ -40,7 +40,7 @@ pkgpyexecdir="\${pyexecdir}/$me"
pyvars='PYTHON_VERSION PYTHON_PLATFORM PYTHON_PREFIX PYTHON_EXEC_PREFIX
pkgpythondir pkgpyexecdir'
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([vars-got pythondir pyexecdir])
AM_PATH_PYTHON
AC_OUTPUT
diff --git a/tests/python-virtualenv.test b/tests/python-virtualenv.test
index 248e0bb5a..c534e8da4 100755
--- a/tests/python-virtualenv.test
+++ b/tests/python-virtualenv.test
@@ -39,7 +39,7 @@ py_version=`python -c 'import sys; print("%u.%u" % tuple(sys.version_info[:2]))'
py_site=$VIRTUAL_ENV/lib/python$py_version/site-packages
# We need control over the package name.
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([am_virtenv], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/python.test b/tests/python.test
index d85631f15..8a39f9f9c 100755
--- a/tests/python.test
+++ b/tests/python.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AM_PATH_PYTHON' >> configure.in
+echo 'AM_PATH_PYTHON' >> configure.ac
cat > Makefile.am << 'END'
python_PYTHON = foo.py
diff --git a/tests/python10.test b/tests/python10.test
index 67db3fbfd..b28c3a449 100755
--- a/tests/python10.test
+++ b/tests/python10.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_PATH_PYTHON
AM_CONDITIONAL([ONE], [test "x$one" = x1])
AC_OUTPUT
diff --git a/tests/python11.test b/tests/python11.test
index 7e2c52a3e..aff3c9c7c 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -19,7 +19,7 @@
# Python is not required for this test.
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
AM_PATH_PYTHON
# The following be executed only after the first run, once a
@@ -40,8 +40,8 @@ grep 'checking for IShouldNotExist1' stdout
grep 'checking for IShouldNotExist2' stdout
grep 'no suitable Python interpreter found' stderr
-sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int
-mv -f configure.int configure.in
+sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.int
+mv -f configure.int configure.ac
$ACLOCAL --force
$AUTOCONF --force
# This one should define PYTHON as ":" and exit successfully.
diff --git a/tests/python12.test b/tests/python12.test
index 38270d04d..3faeb457f 100755
--- a/tests/python12.test
+++ b/tests/python12.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_PATH_PYTHON
AC_OUTPUT
EOF
diff --git a/tests/python3.test b/tests/python3.test
index 6d1fda0f7..72021cd86 100755
--- a/tests/python3.test
+++ b/tests/python3.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_PATH_PYTHON
AC_OUTPUT
EOF
diff --git a/tests/python4.test b/tests/python4.test
index 65d3754b7..4294bb2ef 100755
--- a/tests/python4.test
+++ b/tests/python4.test
@@ -19,7 +19,7 @@
# Python is not required for this test.
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AM_PATH_PYTHON
AC_OUTPUT
EOF
diff --git a/tests/python5.test b/tests/python5.test
index f3ee778fd..80429f9c6 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -20,7 +20,7 @@
# Python is not required for this test.
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
# Hopefully the Python team will never release such a version.
AM_PATH_PYTHON([9999.9])
AC_OUTPUT
diff --git a/tests/python5b.test b/tests/python5b.test
index e95e035db..b382b38f9 100755
--- a/tests/python5b.test
+++ b/tests/python5b.test
@@ -20,7 +20,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
# Hopefully the Python team will never release such a version.
AM_PATH_PYTHON([9999.9])
AC_OUTPUT
diff --git a/tests/python6.test b/tests/python6.test
index 21d8d1ef3..0e09a4381 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -20,7 +20,7 @@
# Python is not required for this test.
. ./defs || Exit 1
-cat >>configure.in <<\EOF
+cat >>configure.ac <<\EOF
AM_PATH_PYTHON(,, [echo "$PYTHON" > py])
AC_OUTPUT
EOF
diff --git a/tests/python7.test b/tests/python7.test
index 070139d87..ec0ac070a 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -20,7 +20,7 @@
# Python is not required for this test.
. ./defs || Exit 1
-cat >>configure.in <<\EOF
+cat >>configure.ac <<\EOF
# Hopefully the Python team will never release such a version.
AM_PATH_PYTHON([9999.9], [], [echo "$PYTHON" > py])
AC_OUTPUT
diff --git a/tests/python8.test b/tests/python8.test
index 1ba387fc5..f999cb684 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -19,7 +19,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
AM_PATH_PYTHON(, [$PYTHON -V >py-version 2>&1])
AC_OUTPUT
diff --git a/tests/python9.test b/tests/python9.test
index 35929c943..e567adcde 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -20,7 +20,7 @@
required=python
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
AM_PATH_PYTHON([0.0], [$PYTHON -c 'print("%u:%u" % (1-1, 2**0))' > py.out])
AC_OUTPUT
diff --git a/tests/recurs.test b/tests/recurs.test
index bcec3653d..5a9c16585 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL(ONE, true)
AM_CONDITIONAL(TWO, false)
diff --git a/tests/remake-all-1.test b/tests/remake-all-1.test
index d9594f779..50cc7a09d 100755
--- a/tests/remake-all-1.test
+++ b/tests/remake-all-1.test
@@ -25,7 +25,7 @@ magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([$mkfile sub/$mkfile])
@@ -51,7 +51,7 @@ $FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
# - either a file in $(am__configure_deps) has been updated ...
$sleep
-echo "AC_SUBST([FOO])" >> configure.in
+echo "AC_SUBST([FOO])" >> configure.ac
$MAKE
$FGREP FOO $mkfile # For debugging.
$FGREP $magic1 $mkfile
diff --git a/tests/remake-all-2.test b/tests/remake-all-2.test
index 3a4c25967..314c970d7 100755
--- a/tests/remake-all-2.test
+++ b/tests/remake-all-2.test
@@ -26,7 +26,7 @@ magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([$mkfile sub/$mkfile])
@@ -59,7 +59,7 @@ $FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
# - either a file in $(am__configure_deps) has been updated ...
$sleep
-echo "AC_SUBST([FOO])" >> configure.in
+echo "AC_SUBST([FOO])" >> configure.ac
$MAKE -f $mkfile
$FGREP FOO $mkfile # For debugging.
$FGREP $magic1 $mkfile
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
index d6d225ab3..c56760842 100755
--- a/tests/remake-am-pr10111.test
+++ b/tests/remake-am-pr10111.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
@@ -53,7 +53,7 @@ mkdir build
cd build
../configure
# He wants to verify that the rules he's written to rebuild a file
-# included by configure.in works also in VPATH builds.
+# included by configure.ac works also in VPATH builds.
rm -f ../foobar.am
$MAKE
grep '= foobar was here =' ../Makefile.in
diff --git a/tests/remake-deleted-am-2.test b/tests/remake-deleted-am-2.test
index e855115da..61696393e 100755
--- a/tests/remake-deleted-am-2.test
+++ b/tests/remake-deleted-am-2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
$ACLOCAL
$AUTOCONF
diff --git a/tests/remake-deleted-am-subdir.test b/tests/remake-deleted-am-subdir.test
index 022fbb7b7..fefe1ff08 100755
--- a/tests/remake-deleted-am-subdir.test
+++ b/tests/remake-deleted-am-subdir.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_OUTPUT
END
diff --git a/tests/remake-deleted-am.test b/tests/remake-deleted-am.test
index ba8c6f962..2543bd6c4 100755
--- a/tests/remake-deleted-am.test
+++ b/tests/remake-deleted-am.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
$ACLOCAL
$AUTOCONF
diff --git a/tests/remake-deleted-m4-file.test b/tests/remake-deleted-m4-file.test
index ce5d3d594..177979e9e 100755
--- a/tests/remake-deleted-m4-file.test
+++ b/tests/remake-deleted-m4-file.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
FOO_MACRO
AC_OUTPUT
END
@@ -64,8 +64,8 @@ $MAKE test
$sleep
-sed -e "s|FOO_MACRO|$macro_value|" configure.in > t
-mv -f t configure.in
+sed -e "s|FOO_MACRO|$macro_value|" configure.ac > t
+mv -f t configure.ac
rm -f m4/foo.m4
using_gmake || $MAKE Makefile
diff --git a/tests/remake-gnulib-add-acsubst.test b/tests/remake-gnulib-add-acsubst.test
index 22101a684..23a02bc18 100755
--- a/tests/remake-gnulib-add-acsubst.test
+++ b/tests/remake-gnulib-add-acsubst.test
@@ -24,7 +24,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
MY_MACROS
AC_OUTPUT
diff --git a/tests/remake-gnulib-add-header.test b/tests/remake-gnulib-add-header.test
index 2c6fc38bc..97f0c037e 100755
--- a/tests/remake-gnulib-add-header.test
+++ b/tests/remake-gnulib-add-header.test
@@ -24,7 +24,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
diff --git a/tests/remake-gnulib-remove-header.test b/tests/remake-gnulib-remove-header.test
index 8fc80cbf4..04f341042 100755
--- a/tests/remake-gnulib-remove-header.test
+++ b/tests/remake-gnulib-remove-header.test
@@ -25,7 +25,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
index c988f2843..09a2a4c9f 100755
--- a/tests/remake-m4-pr10111.test
+++ b/tests/remake-m4-pr10111.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
m4_include([foobar.m4])
AC_OUTPUT
END
@@ -51,7 +51,7 @@ mkdir build
cd build
../configure
# He wants to verify that the rules he's written to rebuild a file
-# included by configure.in works also in VPATH builds.
+# included by configure.ac works also in VPATH builds.
rm -f ../foobar.m4
$MAKE
grep ': foobar was here :' ../configure
diff --git a/tests/remake-moved-m4-file.test b/tests/remake-moved-m4-file.test
index 03d362936..f1281ab2d 100755
--- a/tests/remake-moved-m4-file.test
+++ b/tests/remake-moved-m4-file.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
MY_MACRO
AC_OUTPUT
END
diff --git a/tests/remake-renamed-am.test b/tests/remake-renamed-am.test
index 3febaa33e..2ccc9ba1b 100755
--- a/tests/remake-renamed-am.test
+++ b/tests/remake-renamed-am.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
include foo.am
diff --git a/tests/remake-renamed-m4-file.test b/tests/remake-renamed-m4-file.test
index 32ecf9da8..87721f55d 100755
--- a/tests/remake-renamed-m4-file.test
+++ b/tests/remake-renamed-m4-file.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
MY_MACRO
AC_OUTPUT
END
diff --git a/tests/remake-renamed-m4-macro-and-file.test b/tests/remake-renamed-m4-macro-and-file.test
index afd8d6ecd..77e9d3eb5 100755
--- a/tests/remake-renamed-m4-macro-and-file.test
+++ b/tests/remake-renamed-m4-macro-and-file.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
MY_MACRO
AC_OUTPUT
END
@@ -72,8 +72,8 @@ sed -e 's/BAR_MACRO/QUUX_MACRO/' \
sed -e 's/BAR_MACRO/QUUX_MACRO/' -e 's/MY_MACRO/A_MACRO/' \
m4/macros.m4 > m4/defs.m4
rm -f m4/macros.m4 m4/bar.m4
-sed -e 's/BAR_MACRO/QUUX_MACRO/' -e 's/MY_MACRO/A_MACRO/' configure.in > t
-mv -f t configure.in
+sed -e 's/BAR_MACRO/QUUX_MACRO/' -e 's/MY_MACRO/A_MACRO/' configure.ac > t
+mv -f t configure.ac
using_gmake || $MAKE Makefile
$MAKE test
$MAKE distdir
diff --git a/tests/remake-renamed-m4-macro.test b/tests/remake-renamed-m4-macro.test
index 38036cb86..5ec71d692 100755
--- a/tests/remake-renamed-m4-macro.test
+++ b/tests/remake-renamed-m4-macro.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
MY_MACRO
AC_OUTPUT
END
@@ -61,7 +61,7 @@ $MAKE test
$sleep
-for f in m4/macros.m4 configure.in; do
+for f in m4/macros.m4 configure.ac; do
sed -e 's/MY_MACRO/YOUR_MACRO/' $f > t
mv -f t $f
done
diff --git a/tests/remake-subdir-from-subdir.test b/tests/remake-subdir-from-subdir.test
index 22aafb45c..62a8427ef 100755
--- a/tests/remake-subdir-from-subdir.test
+++ b/tests/remake-subdir-from-subdir.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
m4_include([subdirs.m4])
AC_SUBST([MAGIC], [magic])
AC_OUTPUT
diff --git a/tests/remake-subdir-gnu.test b/tests/remake-subdir-gnu.test
index 11664b949..cf135face 100755
--- a/tests/remake-subdir-gnu.test
+++ b/tests/remake-subdir-gnu.test
@@ -32,7 +32,7 @@ debug_info ()
sub/GNUmakefile.in sub/GNUmakefile
}
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([GNUmakefile sub/GNUmakefile])
@@ -56,8 +56,8 @@ $MAKE
debug_info
$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
cd sub
$MAKE
cd ..
diff --git a/tests/remake-subdir-long-time.test b/tests/remake-subdir-long-time.test
index 0eee5a01e..8f3174025 100755
--- a/tests/remake-subdir-long-time.test
+++ b/tests/remake-subdir-long-time.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AC_CONFIG_FILES([Makefile sub/Makefile])
@@ -96,8 +96,8 @@ rm -f automake-has-run aclocal-has-run
ACLOCAL=false AUTOMAKE=false AUTOCONF=false $MAKE -e
$sleep
-sed "s|magic|magic2|" configure.in > t
-mv -f t configure.in
+sed "s|magic|magic2|" configure.ac > t
+mv -f t configure.ac
cd sub
AUTOMAKE="$AUTOMAKE" ACLOCAL="$ACLOCAL" $MAKE -e Makefile
diff --git a/tests/remake-subdir.test b/tests/remake-subdir.test
index 7df8a879c..3b3a8c1b0 100755
--- a/tests/remake-subdir.test
+++ b/tests/remake-subdir.test
@@ -35,7 +35,7 @@ debug_info ()
grep -i magic configure Makefile.in Makefile sub/Makefile.in sub/Makefile
}
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_SUBST([MAGIC], [magic])
AC_OUTPUT
@@ -57,8 +57,8 @@ $MAKE
debug_info
$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
cd sub
$remake
cd ..
diff --git a/tests/remake-subdir2.test b/tests/remake-subdir2.test
index 7b2c1baef..97d4baf77 100755
--- a/tests/remake-subdir2.test
+++ b/tests/remake-subdir2.test
@@ -29,7 +29,7 @@ debug_info ()
grep -i magic configure build.in build.mk sub/build.in sub/build.mk
}
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([build.mk:build.in])
@@ -58,8 +58,8 @@ $MAKE -f build.mk
debug_info
$sleep
-sed "s|magic|$magic1|" configure.in > t
-mv -f t configure.in
+sed "s|magic|$magic1|" configure.ac > t
+mv -f t configure.ac
cd sub
$MAKE -f build.mk build.mk
cd ..
diff --git a/tests/remake.test b/tests/remake.test
index e9afa4d18..75785e835 100755
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/remake10a.test b/tests/remake10a.test
index bafb0823b..9cb835cf7 100755
--- a/tests/remake10a.test
+++ b/tests/remake10a.test
@@ -30,7 +30,7 @@ else
remake="$MAKE Makefile"
fi
-cat >> configure.in <<END
+cat >> configure.ac <<END
m4_include([foo.m4])
AC_SUBST([FINGERPRINT], [my_fingerprint])
AC_OUTPUT
diff --git a/tests/remake10b.test b/tests/remake10b.test
index cb96339b6..2fce52c07 100755
--- a/tests/remake10b.test
+++ b/tests/remake10b.test
@@ -30,7 +30,7 @@ else
remake="$MAKE Makefile"
fi
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/remake10c.test b/tests/remake10c.test
index 01e761d0f..51537c129 100755
--- a/tests/remake10c.test
+++ b/tests/remake10c.test
@@ -30,7 +30,7 @@ else
remake="$MAKE Makefile"
fi
-cat >> configure.in <<END
+cat >> configure.ac <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
AC_OUTPUT
diff --git a/tests/remake11.test b/tests/remake11.test
index 32d320d99..ec96a0829 100755
--- a/tests/remake11.test
+++ b/tests/remake11.test
@@ -26,20 +26,20 @@ ocwd=`pwd` || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
-echo "AC_SUBST([FOO], [$magic1])" >> configure.in
+echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
echo "@FOO@" > bar.in
-echo "AC_CONFIG_FILES([bar])" >> configure.in
+echo "AC_CONFIG_FILES([bar])" >> configure.ac
for i in 0 1 2 3 4 5 6 7 8 9; do
d=${d+"$d/"}sub$i
echo "SUBDIRS = sub$i" > Makefile.am
- echo "AC_CONFIG_FILES([$d/Makefile])" >> "$ocwd"/configure.in
- echo "AC_CONFIG_FILES([$d/bar])" >> "$ocwd"/configure.in
+ echo "AC_CONFIG_FILES([$d/Makefile])" >> "$ocwd"/configure.ac
+ echo "AC_CONFIG_FILES([$d/bar])" >> "$ocwd"/configure.ac
mkdir sub$i
cd sub$i
echo "$d: @FOO@" > bar.in
done
-echo AC_OUTPUT >> "$ocwd"/configure.in
+echo AC_OUTPUT >> "$ocwd"/configure.ac
: > Makefile.am
unset d i
bottom=`pwd`
@@ -51,7 +51,7 @@ makefiles_list=`echo "$makefiles_am_list" | sed 's/\.am$//'`
bar_in_list=`find . -name bar.in | LC_ALL=C sort`
bar_list=`echo "$bar_in_list" | sed 's/\.in$//'`
-cat configure.in # For debugging.
+cat configure.ac # For debugging.
$ACLOCAL
$AUTOMAKE
@@ -64,8 +64,8 @@ for f in configure config.status $makefiles_list $bar_list; do
done
$sleep
-sed "s/$magic1/$magic2/" configure.in >configure.tmp
-mv -f configure.tmp configure.in
+sed "s/$magic1/$magic2/" configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
cd "$bottom"
$MAKE
diff --git a/tests/remake12.test b/tests/remake12.test
index 720b71fe3..103e00962 100755
--- a/tests/remake12.test
+++ b/tests/remake12.test
@@ -38,7 +38,7 @@ else
skip_ "make doesn't support any \"include\" directive"
fi
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([zardoz])
@@ -116,9 +116,9 @@ $FGREP $magic2 zardoz.in
$sleep
sed 's/^\(AC_CONFIG_FILES\)(.*/\1([zardoz:top.in:quux.in:bot.in])/' \
- <configure.in >t
-mv -f t configure.in
-cat configure.in # For debugging.
+ <configure.ac >t
+mv -f t configure.ac
+cat configure.ac # For debugging.
sed '/^#H:/d' zardoz.am > quux.am
echo 'FOO = dummy' >> quux.am
echo 'BAR = $(BAZ)' > top.in
diff --git a/tests/remake1a.test b/tests/remake1a.test
index c6f6ae52a..ce32cbcd8 100755
--- a/tests/remake1a.test
+++ b/tests/remake1a.test
@@ -21,7 +21,7 @@
fingerprint='=/FiNgErPrInT/='
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/remake2.test b/tests/remake2.test
index 95d210f9e..228b14f56 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/remake3.test b/tests/remake3.test
index 6e7e2325a..361b5f410 100755
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/foo])
AC_OUTPUT
END
diff --git a/tests/remake3a.test b/tests/remake3a.test
index 4aa549a8b..b10c541d7 100755
--- a/tests/remake3a.test
+++ b/tests/remake3a.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/foo])
AC_OUTPUT
END
diff --git a/tests/remake4.test b/tests/remake4.test
index e2fd13280..2205ab417 100755
--- a/tests/remake4.test
+++ b/tests/remake4.test
@@ -27,7 +27,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
# Rebuild rule are ok until make dist, but not afterwards.
if test ! -f rebuild_ok; then
ACLOCAL=false
diff --git a/tests/remake5.test b/tests/remake5.test
index 42f08065d..dba802a89 100755
--- a/tests/remake5.test
+++ b/tests/remake5.test
@@ -26,7 +26,7 @@ else
remake="$MAKE Makefile"
fi
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_MAINTAINER_MODE
m4_include([foo.m4])
if test ! -f rebuild_ok; then
@@ -50,7 +50,7 @@ $MAKE
# triggered by default. ($MAKE will fail if they are, because the
# tools are set to false.)
$sleep
-touch aclocal.m4 Makefile.am configure.in foo.m4
+touch aclocal.m4 Makefile.am configure.ac foo.m4
$remake
# Make sure the rebuild rule for Makefile is triggered.
diff --git a/tests/remake6.test b/tests/remake6.test
index b7e5f0b0d..c48c1b882 100755
--- a/tests/remake6.test
+++ b/tests/remake6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/remake7.test b/tests/remake7.test
index 6e3ef2a84..fbd15e66b 100755
--- a/tests/remake7.test
+++ b/tests/remake7.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/remake8a.test b/tests/remake8a.test
index cf4f2ee3f..ed790245b 100755
--- a/tests/remake8a.test
+++ b/tests/remake8a.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-mv -f configure.in configure.stub
+mv -f configure.ac configure.stub
cat > Makefile.am <<'END'
all-local: foo
@@ -35,7 +35,7 @@ check-local:
CLEANFILES = foo
END
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_OUTPUT
END
@@ -79,7 +79,7 @@ $MAKE distcheck
rm -f bar
-# Modify Makefile.am and configure.in.
+# Modify Makefile.am and configure.ac.
$sleep
@@ -91,7 +91,7 @@ check-local:
test ! -r bar
END
-cat $srcdir/configure.stub - > $srcdir/configure.in <<'END'
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
AC_CONFIG_FILES([quux])
AC_SUBST([QUUX], [Zardoz])
AC_OUTPUT
@@ -128,11 +128,11 @@ END
$MAKE # This should place aclocal flags in Makefile.
grep '.*-I m4' Makefile # Sanity check.
-# Modify configure.in and aclocal.m4.
+# Modify configure.ac and aclocal.m4.
$sleep
-cat $srcdir/configure.stub - > $srcdir/configure.in <<'END'
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
AC_CONFIG_FILES([quux])
MY_CUSTOM_MACRO
AC_OUTPUT
@@ -149,7 +149,7 @@ $MAKE distcheck
# Modify Makefile.am, remove aclocal.m4, and add a new m4 file to
# the directory of extra m4 files considered by aclocal. This new
-# file should now provide a macro required by configure.in and that
+# file should now provide a macro required by configure.ac and that
# was previously provided by aclocal.m4.
$sleep
@@ -169,7 +169,7 @@ $MAKE distcheck
# Modify Makefile.am, remove all the extra m4 files to considered
# by aclocal, and add an acinclude.m4 file. This last file should
-# now provide a macro required by configure.in, and that was
+# now provide a macro required by configure.ac, and that was
# previously provided by the extra m4 files considered by aclocal.
$sleep
diff --git a/tests/remake8b.test b/tests/remake8b.test
index 1bfaf8811..6754ed3ff 100755
--- a/tests/remake8b.test
+++ b/tests/remake8b.test
@@ -23,7 +23,7 @@
. ./defs || Exit 1
-mv -f configure.in configure.stub
+mv -f configure.ac configure.stub
cat > Makefile.am <<'END'
all-local: foo
@@ -35,7 +35,7 @@ check-local:
CLEANFILES = foo
END
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_OUTPUT
END
@@ -81,7 +81,7 @@ $MAKE distcheck
rm -f bar
-# Modify Makefile.am and configure.in.
+# Modify Makefile.am and configure.ac.
$sleep
@@ -93,7 +93,7 @@ check-local:
test ! -r bar
END
-cat $srcdir/configure.stub - > $srcdir/configure.in <<'END'
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
AC_CONFIG_FILES([quux])
AC_SUBST([QUUX], [Zardoz])
AC_OUTPUT
@@ -130,11 +130,11 @@ END
$MAKE # This should place aclocal flags in Makefile.
grep '.*-I m4' Makefile # Sanity check.
-# Modify configure.in and aclocal.m4.
+# Modify configure.ac and aclocal.m4.
$sleep
-cat $srcdir/configure.stub - > $srcdir/configure.in <<'END'
+cat $srcdir/configure.stub - > $srcdir/configure.ac <<'END'
AC_CONFIG_FILES([quux])
MY_CUSTOM_MACRO
AC_OUTPUT
@@ -151,7 +151,7 @@ $MAKE distcheck
# Modify Makefile.am, remove aclocal.m4, and add a new m4 file to
# the directory of extra m4 files considered by aclocal. This new
-# file should now provide a macro required by configure.in and that
+# file should now provide a macro required by configure.ac and that
# was previously provided by aclocal.m4.
$sleep
@@ -171,7 +171,7 @@ $MAKE distcheck
# Modify Makefile.am, remove all the extra m4 files to considered
# by aclocal, and add an acinclude.m4 file. This last file should
-# now provide a macro required by configure.in, and that was
+# now provide a macro required by configure.ac, and that was
# previously provided by the extra m4 files considered by aclocal.
$sleep
diff --git a/tests/remake9a.test b/tests/remake9a.test
index 677b161aa..90a780a40 100755
--- a/tests/remake9a.test
+++ b/tests/remake9a.test
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test remake rules when configure.in or its prerequisites change.
+# Test remake rules when configure.ac or its prerequisites change.
# Keep in sync with the other sister tests `remake9*.test'.
. ./defs || Exit 1
@@ -28,7 +28,7 @@ else
remake_() { $MAKE Makefile && $MAKE foo.sh; }
fi
-cat >> configure.in <<END
+cat >> configure.ac <<END
FINGERPRINT=BadBadBad
AC_SUBST([FINGERPRINT])
AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
@@ -39,7 +39,7 @@ cat > Makefile.am <<'END'
nil:
.PHONY: nil
-$(srcdir)/configure.in: $(srcdir)/tweak-configure-in
+$(srcdir)/configure.ac: $(srcdir)/tweak-configure-in
$(SHELL) $(srcdir)/tweak-configure-in <$@ >$@-t
mv -f $@-t $@
EXTRA_DIST = $(srcdir)/tweak-configure-in
@@ -76,8 +76,8 @@ for vpath in : false; do
$MAKE # Should be a no-op.
$sleep
- sed "s/^\\(FINGERPRINT\\)=.*/\\1=$magic1/" $srcdir/configure.in >t
- mv -f t $srcdir/configure.in
+ sed "s/^\\(FINGERPRINT\\)=.*/\\1=$magic1/" $srcdir/configure.ac >t
+ mv -f t $srcdir/configure.ac
remake_
$FGREP FINGERPRINT Makefile # For debugging.
$FGREP $magic1 Makefile
@@ -94,8 +94,8 @@ for vpath in : false; do
$sleep
echo cat > $srcdir/tweak-configure-in # Make it a no-op again.
- sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.in >t
- mv -f t $srcdir/configure.in
+ sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.ac >t
+ mv -f t $srcdir/configure.ac
using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # Sanity check.
diff --git a/tests/remake9b.test b/tests/remake9b.test
index 4747c0c93..77ebaae1c 100755
--- a/tests/remake9b.test
+++ b/tests/remake9b.test
@@ -28,7 +28,7 @@ fi
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/remake9c.test b/tests/remake9c.test
index 7a27acc4e..77a327fac 100755
--- a/tests/remake9c.test
+++ b/tests/remake9c.test
@@ -28,7 +28,7 @@ else
remake_() { $MAKE Makefile && $MAKE foo.sh; }
fi
-cat >> configure.in <<END
+cat >> configure.ac <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
diff --git a/tests/remake9d.test b/tests/remake9d.test
index 4e2aee702..4ebd3e761 100755
--- a/tests/remake9d.test
+++ b/tests/remake9d.test
@@ -28,7 +28,7 @@ else
remake_() { $MAKE Makefile && $MAKE foo.sh; }
fi
-cat >> configure.in <<END
+cat >> configure.ac <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index 827f877a2..8ad576500 100755
--- a/tests/repeated-options.test
+++ b/tests/repeated-options.test
@@ -20,7 +20,7 @@
required='cc bzip2'
. ./defs || Exit 1
-cat >configure.in <<END
+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
diff --git a/tests/req.test b/tests/req.test
index abe1ef8e7..cfc3b4399 100755
--- a/tests/req.test
+++ b/tests/req.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in <<EOF
+cat > configure.ac <<EOF
AC_INIT
AM_INIT_GUILE_MODULE
EOF
diff --git a/tests/reqd.test b/tests/reqd.test
index 021b114c6..9e0bcc1f1 100755
--- a/tests/reqd.test
+++ b/tests/reqd.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<EOF
+cat >> configure.ac <<EOF
AC_CONFIG_FILES([one/Makefile two/Makefile])
AC_OUTPUT
EOF
diff --git a/tests/reqd2.test b/tests/reqd2.test
index 3008583b3..a9442a29b 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -21,7 +21,7 @@
required='libtoolize'
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([req2], [1.0])
AC_CONFIG_AUX_DIR([autoconf])
AM_INIT_AUTOMAKE
@@ -52,6 +52,6 @@ $AUTOCONF
test -f autoconf/ltmain.sh # Sanity check.
rm -f autoconf/ltmain.sh
AUTOMAKE_fails --add-missing --copy
-grep '^configure\.in:7:.* required file.*autoconf/ltmain\.sh' stderr
+grep '^configure\.ac:7:.* required file.*autoconf/ltmain\.sh' stderr
:
diff --git a/tests/sanity.test b/tests/sanity.test
index 0620c171c..d4f328c61 100755
--- a/tests/sanity.test
+++ b/tests/sanity.test
@@ -21,7 +21,7 @@
mkdir 'unsafe$'
cd 'unsafe$'
-mv ../configure.in .
+mv ../configure.ac .
mv ../install-sh ../missing .
: > Makefile.am
diff --git a/tests/seenc.test b/tests/seenc.test
index 0cb26d172..d1bfa23a1 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl AC_PROG_CC and AC_PROG_CXX missing on purpose
AC_LIBOBJ([fsusage])
AC_LIBOBJ([mountlist])
diff --git a/tests/self-check-dir.tap b/tests/self-check-dir.tap
index a93418844..45da51147 100755
--- a/tests/self-check-dir.tap
+++ b/tests/self-check-dir.tap
@@ -51,7 +51,7 @@ do_check 'testdir has the expected path' \
do_check 'fully pre-populated testdir' \
'unset am_create_testdir' \
'test -f install-sh || Exit 1
- test -f configure.in || Exit 1
+ test -f configure.ac || Exit 1
case `pwd` in '"$cwd"'/_self.dir) : ;; *) Exit 1;; esac'
do_check 'testdir has the expected path' \
diff --git a/tests/silent-configsite.test b/tests/silent-configsite.test
index 681c2747e..813753b74 100755
--- a/tests/silent-configsite.test
+++ b/tests/silent-configsite.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AM_SILENT_RULES
AC_OUTPUT
EOF
@@ -35,7 +35,7 @@ EOF
unset enable_silent_rules || :
-: 'No explicit default in configure.in, enable by default in config.site'
+: 'No explicit default in configure.ac, enable by default in config.site'
$ACLOCAL
$AUTOCONF
@@ -49,10 +49,10 @@ CONFIG_SITE=./config.site ./configure --disable-silent-rules
$MAKE test-nosilent
$MAKE distclean
-: 'Disable by default in configure.in, enable by default in config.site'
+: 'Disable by default in configure.ac, enable by default in config.site'
-sed 's/^AM_SILENT_RULES/&([no])/' configure.in > configure.tmp
-mv -f configure.tmp configure.in
+sed 's/^AM_SILENT_RULES/&([no])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
@@ -65,10 +65,10 @@ CONFIG_SITE=./config.site ./configure --disable-silent-rules
$MAKE test-nosilent
$MAKE distclean
-: 'Enable by default in configure.in, disable by default in config.site'
+: 'Enable by default in configure.ac, disable by default in config.site'
-sed 's/^AM_SILENT_RULES/&([yes])/' configure.in > configure.tmp
-mv -f configure.tmp configure.in
+sed 's/^AM_SILENT_RULES/&([yes])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
diff --git a/tests/silent-lex.test b/tests/silent-lex.test
index 78cd53f81..ff68edaa2 100755
--- a/tests/silent-lex.test
+++ b/tests/silent-lex.test
@@ -23,7 +23,7 @@ set -e
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AM_PROG_CC_C_O
AC_PROG_LEX
diff --git a/tests/silent-many-gcc.test b/tests/silent-many-gcc.test
index ed05785b7..708b9b7c7 100755
--- a/tests/silent-many-gcc.test
+++ b/tests/silent-many-gcc.test
@@ -94,7 +94,7 @@ do_and_check_verbose_build ()
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AM_PROG_CC_C_O
AC_PROG_CXX
diff --git a/tests/silent-many-generic.test b/tests/silent-many-generic.test
index 409a08bb7..2f4cd9b8a 100755
--- a/tests/silent-many-generic.test
+++ b/tests/silent-many-generic.test
@@ -95,7 +95,7 @@ do_and_check_verbose_build ()
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AM_PROG_CC_C_O
AC_PROG_F77
diff --git a/tests/silent-nested-vars.test b/tests/silent-nested-vars.test
index ad7a462f7..c9b573375 100755
--- a/tests/silent-nested-vars.test
+++ b/tests/silent-nested-vars.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/silent-nowarn.test b/tests/silent-nowarn.test
index 18f00322c..5a547bc13 100755
--- a/tests/silent-nowarn.test
+++ b/tests/silent-nowarn.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
# Yes, we repeat the warnings two times, both before and after
# 'silent-rules'. This is deliberate.
diff --git a/tests/silent-yacc-headers.test b/tests/silent-yacc-headers.test
index a87047530..aaf0b3020 100755
--- a/tests/silent-yacc-headers.test
+++ b/tests/silent-yacc-headers.test
@@ -24,7 +24,7 @@ set -e
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_YACC
AC_PROG_CC
diff --git a/tests/silent-yacc.test b/tests/silent-yacc.test
index fc02353a5..11fa19732 100755
--- a/tests/silent-yacc.test
+++ b/tests/silent-yacc.test
@@ -24,7 +24,7 @@ set -e
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AM_PROG_CC_C_O
AC_PROG_YACC
diff --git a/tests/silent.test b/tests/silent.test
index c08fccaa6..f914c445c 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -23,7 +23,7 @@ required=cc
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/silent2.test b/tests/silent2.test
index 2fc32c5aa..6565a2701 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -24,7 +24,7 @@ required=gcc
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/silent3.test b/tests/silent3.test
index b5667a8b2..21609f159 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -23,7 +23,7 @@ required='cc libtoolize'
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/silent4.test b/tests/silent4.test
index 1e7166440..cce38fcfd 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -24,7 +24,7 @@ required="libtoolize gcc"
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/silent6.test b/tests/silent6.test
index f08ba3b35..96ddeb7e9 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_OUTPUT
EOF
@@ -72,7 +72,7 @@ $MAKE distclean
$sleep
# Things should also work with -Wall in AM_INIT_AUTOMAKE.
-cat > configure.in <<'END'
+cat > configure.ac <<'END'
AC_INIT([silent6], [1.0])
AM_INIT_AUTOMAKE([-Wall])
AC_CONFIG_FILES([Makefile])
@@ -84,7 +84,7 @@ $AUTOMAKE -Wno-error
# AM_SILENT_RULES should turn off the warning.
$sleep
-echo 'AM_SILENT_RULES' >> configure.in
+echo 'AM_SILENT_RULES' >> configure.ac
$ACLOCAL
$AUTOMAKE
grep 'AM_V_GEN' Makefile.in
@@ -93,7 +93,7 @@ grep 'AM_V_GEN' Makefile.in
# The `silent-rules' option to AM_INIT_AUTOMAKE should work likewise.
$sleep
-cat > configure.in <<'END'
+cat > configure.ac <<'END'
AC_INIT([silent6], [1.0])
AM_INIT_AUTOMAKE([silent-rules])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/silent7.test b/tests/silent7.test
index 98cd55fee..d376c278f 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_OUTPUT
EOF
diff --git a/tests/silent8.test b/tests/silent8.test
index c8a987041..257786a62 100755
--- a/tests/silent8.test
+++ b/tests/silent8.test
@@ -19,7 +19,7 @@
required='makeinfo-html tex texi2dvi-o dvips'
. ./defs || Exit 1
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_OUTPUT
EOF
diff --git a/tests/silent9.test b/tests/silent9.test
index 8edfc1828..f8e017ffc 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -23,7 +23,7 @@ required='cc libtoolize'
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/silentcxx-gcc.test b/tests/silentcxx-gcc.test
index 16a44ea94..7699ac8a1 100755
--- a/tests/silentcxx-gcc.test
+++ b/tests/silentcxx-gcc.test
@@ -23,7 +23,7 @@ required=g++
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_CXX
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
index 3621f07f5..192178de4 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx.test
@@ -24,7 +24,7 @@ required=c++
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_CXX
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 6075cf0d9..ce6f6a044 100755
--- a/tests/silentf77.test
+++ b/tests/silentf77.test
@@ -22,7 +22,7 @@ required=fortran77
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_F77
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/silentf90.test b/tests/silentf90.test
index bdecd9865..8bb06b262 100755
--- a/tests/silentf90.test
+++ b/tests/silentf90.test
@@ -22,7 +22,7 @@ required=fortran
mkdir sub
-cat >>configure.in <<'EOF'
+cat >>configure.ac <<'EOF'
AM_SILENT_RULES
AC_PROG_FC
AC_CONFIG_FILES([sub/Makefile])
diff --git a/tests/space.test b/tests/space.test
index efefab389..c46ade12f 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = foo
diff --git a/tests/specflg-dummy.test b/tests/specflg-dummy.test
index b030585d7..ae6473a8b 100755
--- a/tests/specflg-dummy.test
+++ b/tests/specflg-dummy.test
@@ -51,7 +51,7 @@ AC_DEFUN([AC_PROG_LIBTOOL], [AC_SUBST([LIBTOOL], [dummy])])
END
: > ltmain.sh
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/specflg.test b/tests/specflg.test
index 44fb7b8d5..b4ffd00f8 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
END
diff --git a/tests/specflg10.test b/tests/specflg10.test
index 76e167735..3b8fc5be4 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -19,7 +19,7 @@
required='cc c++'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
diff --git a/tests/specflg2.test b/tests/specflg2.test
index 38a9168ba..be7ebb5a2 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
diff --git a/tests/specflg3.test b/tests/specflg3.test
index b4611aa23..9e7887264 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/specflg6.test b/tests/specflg6.test
index 846eab36c..f420cdfd2 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_CONDITIONAL([BAR], [true])
diff --git a/tests/specflg7.test b/tests/specflg7.test
index 83c8193c9..26ad75cf5 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -19,7 +19,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 8febbcd18..435ce1624 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -21,7 +21,7 @@
required='cc native'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/specflg9.test b/tests/specflg9.test
index c7b2012cf..96e7a2e22 100755
--- a/tests/specflg9.test
+++ b/tests/specflg9.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/spell2.test b/tests/spell2.test
index 0a504c0c8..a4b0a4605 100755
--- a/tests/spell2.test
+++ b/tests/spell2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+echo AC_PROG_CC >> configure.ac
cat > Makefile.am << 'END'
bin_PROGRAMS = zardoz
diff --git a/tests/srcsub.test b/tests/srcsub.test
index 7ecfacc56..978a10538 100755
--- a/tests/srcsub.test
+++ b/tests/srcsub.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
index fe4428d04..2d6da9793 100755
--- a/tests/srcsub2.test
+++ b/tests/srcsub2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/stamph2.test b/tests/stamph2.test
index d3096ea48..a7a3c3431 100755
--- a/tests/stamph2.test
+++ b/tests/stamph2.test
@@ -17,7 +17,7 @@
# Make sure stamp-h* files are created where we expect
. ./defs || Exit 1
-cat >> configure.in << END
+cat >> configure.ac << END
AM_CONFIG_HEADER([1.h
2.h:config.hin
3.h:sdir1/config1.hin])
diff --git a/tests/stdinc.test b/tests/stdinc.test
index db10243c7..ec9948391 100755
--- a/tests/stdinc.test
+++ b/tests/stdinc.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_CONFIG_HEADERS([sub/config.h])
AC_CONFIG_FILES([sub/bar.h])
diff --git a/tests/stdlib.test b/tests/stdlib.test
index 84412f3e1..1594707c5 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
index 773da1d34..749f22e1d 100755
--- a/tests/stdlib2.test
+++ b/tests/stdlib2.test
@@ -28,7 +28,7 @@ required=libtool
: > config.guess
: > config.sub
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/strictness-override.test b/tests/strictness-override.test
index 8acbda07a..8c365f0a0 100755
--- a/tests/strictness-override.test
+++ b/tests/strictness-override.test
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The strictness specified in Makefile.am:AUTOMAKE_OPTIONS should
-# override that specified in configure.in:AM_INIT_AUTOMAKE, and both
+# override that specified in configure.ac:AM_INIT_AUTOMAKE, and both
# should override the strictness specified on the command line.
# NOTE: the current semantics might not be the best one (even if it has
# been in place for quite a long time); see also Automake bug #7673.
@@ -59,63 +59,63 @@ touch INSTALL NEWS AUTHORS ChangeLog COPYING
rm -rf autom4te*.cache
set_strictness '' Makefile.am
-set_strictness '' configure.in
+set_strictness '' configure.ac
ko --gnu
ko
ok --foreign
rm -rf autom4te*.cache
set_strictness 'gnu' Makefile.am
-set_strictness '' configure.in
+set_strictness '' configure.ac
ko --gnu
ko
ko --foreign
rm -rf autom4te*.cache
set_strictness '' Makefile.am
-set_strictness 'gnu' configure.in
+set_strictness 'gnu' configure.ac
ko --gnu
ko
ko --foreign
rm -rf autom4te*.cache
set_strictness 'foreign' Makefile.am
-set_strictness '' configure.in
+set_strictness '' configure.ac
ok --gnu
ok
ok --foreign
rm -rf autom4te*.cache
set_strictness '' Makefile.am
-set_strictness 'foreign' configure.in
+set_strictness 'foreign' configure.ac
ok --gnu
ok
ok --foreign
rm -rf autom4te*.cache
set_strictness 'gnu' Makefile.am
-set_strictness 'gnu' configure.in
+set_strictness 'gnu' configure.ac
ko --gnu
ko
ko --foreign
rm -rf autom4te*.cache
set_strictness 'foreign' Makefile.am
-set_strictness 'foreign' configure.in
+set_strictness 'foreign' configure.ac
ok --gnu
ok
ok --foreign
rm -rf autom4te*.cache
set_strictness 'foreign' Makefile.am
-set_strictness 'gnu' configure.in
+set_strictness 'gnu' configure.ac
ok --gnu
ok
ok --foreign
rm -rf autom4te*.cache
set_strictness 'gnu' Makefile.am
-set_strictness 'foreign' configure.in
+set_strictness 'foreign' configure.ac
ko --gnu
ko
ko --foreign
diff --git a/tests/strictness-precedence.test b/tests/strictness-precedence.test
index 34b884486..6f5a143da 100755
--- a/tests/strictness-precedence.test
+++ b/tests/strictness-precedence.test
@@ -57,16 +57,16 @@ ko --foreign --gnu
ok --gnu --foreign
set_strictness '' Makefile.am
-set_strictness 'gnu foreign' configure.in
+set_strictness 'gnu foreign' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
ok
-set_strictness 'foreign gnu' configure.in
+set_strictness 'foreign gnu' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
ko
-set_strictness '' configure.in
+set_strictness '' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
set_strictness 'gnu foreign' Makefile.am
diff --git a/tests/strip.test b/tests/strip.test
index 2e1338d05..dfefcd9c2 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/strip2.test b/tests/strip2.test
index f1df9058f..49a5c066c 100755
--- a/tests/strip2.test
+++ b/tests/strip2.test
@@ -20,7 +20,7 @@
required='cc strip'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/strip3.test b/tests/strip3.test
index af0ef2d57..187e8a58e 100755
--- a/tests/strip3.test
+++ b/tests/strip3.test
@@ -20,7 +20,7 @@
required='cc libtoolize strip'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/subcond.test b/tests/subcond.test
index e0910e36f..c09e5ad4f 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -19,7 +19,7 @@
required=gettext
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_GNU_GETTEXT
AM_CONDITIONAL(MAUDE, true)
ALL_LINGUAS=
diff --git a/tests/subcond2.test b/tests/subcond2.test
index 304b2ed6e..d3e367957 100755
--- a/tests/subcond2.test
+++ b/tests/subcond2.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_CONDITIONAL([COND_OPT], [test "$want_opt" = yes])
AC_CONFIG_FILES([src/Makefile opt/Makefile])
AC_OUTPUT
diff --git a/tests/subcond3.test b/tests/subcond3.test
index d701dde70..39b39d95b 100755
--- a/tests/subcond3.test
+++ b/tests/subcond3.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
if test "$want_opt" = yes; then
MAYBE_OPT=opt
else
diff --git a/tests/subdir.test b/tests/subdir.test
index 20ad10e70..34b6ece88 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -21,7 +21,7 @@
mkdir zot
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([zot/Makefile])
AC_OUTPUT
END
diff --git a/tests/subdir10.test b/tests/subdir10.test
index 67a22a956..4ba791ad8 100755
--- a/tests/subdir10.test
+++ b/tests/subdir10.test
@@ -20,7 +20,7 @@
mkdir sub
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/subdir2.test b/tests/subdir2.test
index 7311c6cae..3ef415108 100755
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -21,7 +21,7 @@
mkdir one
mkdir one/two
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([one/Makefile one/two/Makefile])
AC_OUTPUT
END
diff --git a/tests/subdir3.test b/tests/subdir3.test
index 5e48d4d31..d9b160fa8 100755
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -24,7 +24,7 @@ zardoz_SOURCES = y.c x/z.c
widdershins_SOURCES = x/z.c
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/subdir4.test b/tests/subdir4.test
index f0cf1c33b..2094a1a10 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -21,7 +21,7 @@
mkdir lib src
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_RANLIB
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/subdir5.test b/tests/subdir5.test
index c0c7548e9..ed8eb7564 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
@@ -35,20 +35,20 @@ $MAKE
# Now add new directories.
-# First we add a new directory by modifying configure.in directly.
-# We update configure.in *before* updating sub/Makefile.am; subdir8.test
+# First we add a new directory by modifying configure.ac directly.
+# We update configure.ac *before* updating sub/Makefile.am; subdir8.test
# does it in the other way: it updates confiles.m4 (which is m4_included
-# by configure.in there) after Makefile.am.
+# by configure.ac there) after Makefile.am.
# Modified configure dependencies must be newer than config.status.
$sleep
-sed <configure.in >configure.tmp -e '/^AC_OUTPUT$/i\
+sed <configure.ac >configure.tmp -e '/^AC_OUTPUT$/i\
AC_CONFIG_FILES([maude/Makefile])\
m4_include([confile.m4])\
' # Last newline required by older OpenBSD sed.
-mv -f configure.tmp configure.in
+mv -f configure.tmp configure.ac
-cat configure.in # For debugging.
+cat configure.ac # For debugging.
: > confile.m4
@@ -69,7 +69,7 @@ grep '^SUBDIRS = *maude *$' Makefile
test -f maude/Makefile
# Then we add a new directory by modifying a file included (through
-# `m4_include') by configure.in.
+# `m4_include') by configure.ac.
mkdir maude2
# Modified configure dependencies must be newer than config.status.
$sleep
diff --git a/tests/subdir6.test b/tests/subdir6.test
index 44e7d51c9..5c17b6550 100755
--- a/tests/subdir6.test
+++ b/tests/subdir6.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
AC_OUTPUT
END
diff --git a/tests/subdir7.test b/tests/subdir7.test
index 49125dd1a..2e26b55b2 100755
--- a/tests/subdir7.test
+++ b/tests/subdir7.test
@@ -20,7 +20,7 @@
mkdir obj
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AC_CONFIG_FILES([obj/Makefile])
AC_OUTPUT
END
diff --git a/tests/subdir8.test b/tests/subdir8.test
index f0c7c491b..f7a464c74 100755
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
m4_include([confiles.m4])
MORE_DEFS
AC_OUTPUT
@@ -50,9 +50,9 @@ $MAKE
# Now add new directories.
# The first step users typically do when adding a new subdir is
-# editing configure.in. That is already tested by subdir5.test,
+# editing configure.ac. That is already tested by subdir5.test,
# though, so here we try to just edit a file that is included by
-# configure.in, without touching configure.in itself.
+# configure.ac, without touching configure.ac itself.
mkdir sub/maude
cat > sub/maude/Makefile.am << 'END'
@@ -67,7 +67,7 @@ mkdir maude
: > maude/Makefile.am
# Update confiles.m4 *after* updating sub/Makefile.am; subdir5.test do
-# it in the other way: it updates configure.in before Makefile.am.
+# it in the other way: it updates configure.ac before Makefile.am.
# We sleep here because modified configure dependencies must be newer
# than config.status.
$sleep
diff --git a/tests/subdir9.test b/tests/subdir9.test
index 8c6a6b6e2..116e1c306 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([src/subdir/Makefile src/subdir2/Makefile])
AC_OUTPUT
END
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
index f2bba568c..23c04f70a 100755
--- a/tests/subdirbuiltsources.test
+++ b/tests/subdirbuiltsources.test
@@ -23,7 +23,7 @@ required=cc
mkdir lib
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([lib/Makefile])
AC_PROG_RANLIB
AC_PROG_CC
diff --git a/tests/subobj.test b/tests/subobj.test
index 291c18d79..b7f6597d4 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
END
diff --git a/tests/subobj10.test b/tests/subobj10.test
index 30f31f170..db6bf7267 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -19,7 +19,7 @@
required=gcc
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([subdir-objects])
diff --git a/tests/subobj11a.test b/tests/subobj11a.test
index 5ceea5b48..d7e3e7cb8 100755
--- a/tests/subobj11a.test
+++ b/tests/subobj11a.test
@@ -29,7 +29,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/subobj11b.test b/tests/subobj11b.test
index a2b664701..fe1de5c52 100755
--- a/tests/subobj11b.test
+++ b/tests/subobj11b.test
@@ -28,7 +28,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
END
diff --git a/tests/subobj11c.test b/tests/subobj11c.test
index 1088f7432..80d394be5 100755
--- a/tests/subobj11c.test
+++ b/tests/subobj11c.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
END
diff --git a/tests/subobj2.test b/tests/subobj2.test
index 038da434f..3a3f86192 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
END
diff --git a/tests/subobj4.test b/tests/subobj4.test
index 4af4901ac..552e178d7 100755
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
diff --git a/tests/subobj5.test b/tests/subobj5.test
index d4bd9cd24..3b05b6a74 100755
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([generic/Makefile])
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/subobj6.test b/tests/subobj6.test
index 87a68150f..2f902f20a 100755
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_CC_C_O
AC_OUTPUT
END
diff --git a/tests/subobj7.test b/tests/subobj7.test
index 367073152..863cae031 100755
--- a/tests/subobj7.test
+++ b/tests/subobj7.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/subobj8.test b/tests/subobj8.test
index 7bfd7edb5..da64f74b2 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([tools])
AM_INIT_AUTOMAKE
diff --git a/tests/subobj9.test b/tests/subobj9.test
index ed5c06402..dfa70c137 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -25,7 +25,7 @@
required='c++ libtoolize'
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([subdir-objects])
AC_PROG_CXX
diff --git a/tests/subobjname.test b/tests/subobjname.test
index d10317d4d..bef3bf0bd 100755
--- a/tests/subobjname.test
+++ b/tests/subobjname.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_CONDITIONAL([FOO1], [some test])
AM_CONDITIONAL([FOO2], [some test])
diff --git a/tests/subpkg-yacc.test b/tests/subpkg-yacc.test
index ca14d80dd..f1b2ac31c 100755
--- a/tests/subpkg-yacc.test
+++ b/tests/subpkg-yacc.test
@@ -20,7 +20,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AC_CONFIG_SUBDIRS([lib])
AC_OUTPUT
diff --git a/tests/subpkg.test b/tests/subpkg.test
index 6f85bfaf0..82bf33818 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -28,7 +28,7 @@ AC_DEFUN([FOO],[
])
EOF
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_SUBDIRS([lib])
FOO
END
diff --git a/tests/subpkg2.test b/tests/subpkg2.test
index fb2afe40b..af89fc173 100755
--- a/tests/subpkg2.test
+++ b/tests/subpkg2.test
@@ -27,7 +27,7 @@ AC_DEFUN([FOO],[
])
EOF
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_SUBDIRS([sub])
AC_OUTPUT
END
diff --git a/tests/subpkg3.test b/tests/subpkg3.test
index 8b4831161..38dc455b9 100755
--- a/tests/subpkg3.test
+++ b/tests/subpkg3.test
@@ -23,7 +23,7 @@ SUBDIRS = subpkg
EXTRA_DIST = subpkg/foobar
END
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_SUBDIRS([subpkg])
AC_OUTPUT
END
@@ -34,7 +34,7 @@ echo foobar >subpkg/foobar
echo SUBDIRS = >subpkg/Makefile.am
-cat >subpkg/configure.in <<'END'
+cat >subpkg/configure.ac <<'END'
AC_INIT([subpkg], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/subpkg4.test b/tests/subpkg4.test
index ca225cacf..28ee7638a 100755
--- a/tests/subpkg4.test
+++ b/tests/subpkg4.test
@@ -34,7 +34,7 @@ test-distdir-is-readable:
fi
END
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_SUBDIRS([subpkg])
AC_OUTPUT
END
@@ -49,7 +49,7 @@ cat >subpkg/Makefile.am <<'END'
EXTRA_DIST = foobar dir
END
-cat >subpkg/configure.in <<'END'
+cat >subpkg/configure.ac <<'END'
AC_INIT([subpkg], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/subst-no-trailing-empty-line.test b/tests/subst-no-trailing-empty-line.test
index 9bae82f34..f288019cb 100755
--- a/tests/subst-no-trailing-empty-line.test
+++ b/tests/subst-no-trailing-empty-line.test
@@ -34,7 +34,7 @@ v3=ABCDEFGHIJKLMNOPQRSTUVWXYZ
# Literal backslash for use by grep.
bs='\\'
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_SUBST([A], [''])
AC_SUBST([$v1], [''])
AC_SUBST([$v2], [''])
diff --git a/tests/subst.test b/tests/subst.test
index c28dbd707..f46f2ed9a 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
dnl This test used to have the following lines, which cannot have
dnl worked sensibly with Autoconf for years, however:
dnl AC_SUBST($1)
diff --git a/tests/subst3.test b/tests/subst3.test
index 47d108074..cc81063e3 100755
--- a/tests/subst3.test
+++ b/tests/subst3.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AC_PROG_CC
AM_PROG_AR
AC_PROG_RANLIB
diff --git a/tests/subst4.test b/tests/subst4.test
index 7c0cc82ab..ab3631e14 100755
--- a/tests/subst4.test
+++ b/tests/subst4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
myrule="\
foo: bar
echo making \$@ from bar
diff --git a/tests/subst5.test b/tests/subst5.test
index ab484a9bc..2fef1b9d5 100755
--- a/tests/subst5.test
+++ b/tests/subst5.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AC_SUBST([substed1])
AC_SUBST([substed2])
diff --git a/tests/substre2.test b/tests/substre2.test
index 99aa3c6e2..a205c085d 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([CC], [whocares])
AC_OUTPUT
END
diff --git a/tests/substref.test b/tests/substref.test
index 6eb5c12ce..7183a9146 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([CC], [whocares])
AC_OUTPUT
END
diff --git a/tests/substtarg.test b/tests/substtarg.test
index abca74923..2e695f843 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SOURCE([fakelib.c])
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/suffix-chain.tap b/tests/suffix-chain.tap
index feb35c30c..604e8a9c2 100755
--- a/tests/suffix-chain.tap
+++ b/tests/suffix-chain.tap
@@ -23,7 +23,7 @@ required=cc
plan_ 8
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/suffix.test b/tests/suffix.test
index 8529a67ff..1490f6ed7 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_RANLIB
END
@@ -34,7 +34,7 @@ for use_arlib in false :; do
if $use_arlib; then
am_warns=
- echo AM_PROG_AR >> configure.in
+ echo AM_PROG_AR >> configure.ac
: > ar-lib
else
am_warns=-Wno-extra-portability
diff --git a/tests/suffix10.tap b/tests/suffix10.tap
index 5af8a18d1..14e0f9925 100755
--- a/tests/suffix10.tap
+++ b/tests/suffix10.tap
@@ -22,7 +22,7 @@ required='cc libtoolize yacc'
plan_ 7
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AC_PROG_YACC
AM_PROG_AR
diff --git a/tests/suffix11.tap b/tests/suffix11.tap
index b69a740f7..cfdd8521e 100755
--- a/tests/suffix11.tap
+++ b/tests/suffix11.tap
@@ -23,7 +23,7 @@ required=cc
plan_ 10
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AC_OUTPUT
EOF
diff --git a/tests/suffix12.test b/tests/suffix12.test
index 61c60d141..5882df7d6 100755
--- a/tests/suffix12.test
+++ b/tests/suffix12.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AC_OUTPUT
EOF
diff --git a/tests/suffix13.test b/tests/suffix13.test
index d5af31bd6..60222052a 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -21,7 +21,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<EOF
+cat >>configure.ac <<EOF
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/suffix2.test b/tests/suffix2.test
index f34a41236..afd67d4fc 100755
--- a/tests/suffix2.test
+++ b/tests/suffix2.test
@@ -21,7 +21,7 @@ required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/suffix3.tap b/tests/suffix3.tap
index 3613480a2..d5d6ba2be 100755
--- a/tests/suffix3.tap
+++ b/tests/suffix3.tap
@@ -21,7 +21,7 @@ required=c++
plan_ 10
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_OUTPUT
END
diff --git a/tests/suffix5.test b/tests/suffix5.test
index cfbc03b30..b3852de4c 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -21,7 +21,7 @@
required='cc libtool'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([LINK], [:])
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/suffix6b.test b/tests/suffix6b.test
index 6deb7dc64..319e02179 100755
--- a/tests/suffix6b.test
+++ b/tests/suffix6b.test
@@ -20,7 +20,7 @@
required=GNUmake # Other makes might not grok dot-less suffix rules.
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
# $(LINK) is not defined automatically by Automake, since the *_SOURCES
# variables don't contain any known extension (.c, .cc, .f, ...).
# So we need this hack -- but since such an hack can also serve as a
diff --git a/tests/suffix6c.test b/tests/suffix6c.test
index cf48c06e8..243cf3cb2 100755
--- a/tests/suffix6c.test
+++ b/tests/suffix6c.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
# $(LINK) is not defined automatically by Automake, since the *_SOURCES
# variables don't contain any known extension (.c, .cc, .f ...),
# So we need this hack -- but since such an hack can also serve as a
diff --git a/tests/suffix8.tap b/tests/suffix8.tap
index 69d298aff..288dd99df 100755
--- a/tests/suffix8.tap
+++ b/tests/suffix8.tap
@@ -23,7 +23,7 @@ required='cc libtoolize'
plan_ 10
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_PROG_AR
AM_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/suffix9.test b/tests/suffix9.test
index 7e4547b5b..a38f143e3 100755
--- a/tests/suffix9.test
+++ b/tests/suffix9.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in << 'END'
+cat >>configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/symlink.test b/tests/symlink.test
index 1936d071b..f4b4338d8 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -22,7 +22,7 @@ am_create_testdir=empty
: > Makefile.am
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([symlink], [1.0])
AC_CONFIG_AUX_DIR([subdir])
AM_INIT_AUTOMAKE
@@ -32,8 +32,8 @@ END
$ACLOCAL
AUTOMAKE_fails --add-missing
-grep '^configure\.in:3: .*missing.*error while making link' stderr
-grep '^configure\.in:3: .*install-sh.*error while making link' stderr
+grep '^configure\.ac:3: .*missing.*error while making link' stderr
+grep '^configure\.ac:3: .*install-sh.*error while making link' stderr
test `$FGREP -c 'error while making link' stderr` -eq 2
diff --git a/tests/tags2.test b/tests/tags2.test
index efc9e48a1..7d4ee6440 100755
--- a/tests/tags2.test
+++ b/tests/tags2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/tagsub.test b/tests/tagsub.test
index 807c8506e..5915d46c0 100755
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -20,7 +20,7 @@
required=etags
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/tap-bad-prog.tap b/tests/tap-bad-prog.tap
index 7504bbd0e..580e7d31c 100755
--- a/tests/tap-bad-prog.tap
+++ b/tests/tap-bad-prog.tap
@@ -25,7 +25,7 @@ fetch_tap_driver
plan_ 6
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tap-basic.test b/tests/tap-basic.test
index 5c4f06af4..3d6d8fe23 100755
--- a/tests/tap-basic.test
+++ b/tests/tap-basic.test
@@ -29,7 +29,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tap-common-setup.test b/tests/tap-common-setup.test
index 1f93cea9b..b14099a5f 100755
--- a/tests/tap-common-setup.test
+++ b/tests/tap-common-setup.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << END
+cat >> configure.ac << END
AC_OUTPUT
END
diff --git a/tests/tap-diagnostic-custom.test b/tests/tap-diagnostic-custom.test
index d11fac974..d3f28a577 100755
--- a/tests/tap-diagnostic-custom.test
+++ b/tests/tap-diagnostic-custom.test
@@ -23,7 +23,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tap-doc.test b/tests/tap-doc.test
index 5622b3fe0..46b3b510c 100755
--- a/tests/tap-doc.test
+++ b/tests/tap-doc.test
@@ -22,7 +22,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/tap-more.test b/tests/tap-more.test
index 413edb1f0..643ca21b0 100755
--- a/tests/tap-more.test
+++ b/tests/tap-more.test
@@ -29,7 +29,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_SUBST([AM_TEST_LOG_DRIVER_FLAGS], ['--comments'])
AC_OUTPUT
END
diff --git a/tests/tap-more2.test b/tests/tap-more2.test
index c5e173a3b..253fdb995 100755
--- a/tests/tap-more2.test
+++ b/tests/tap-more2.test
@@ -25,7 +25,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/tap-recheck.test b/tests/tap-recheck.test
index 6ff5d3d06..4b120a529 100755
--- a/tests/tap-recheck.test
+++ b/tests/tap-recheck.test
@@ -22,7 +22,7 @@ am_parallel_tests=yes
fetch_tap_driver
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap
index 58f8d0cc8..ab1cd40ef 100755
--- a/tests/tap-signal.tap
+++ b/tests/tap-signal.tap
@@ -24,7 +24,7 @@ fetch_tap_driver
plan_ 10
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tap-summary-aux.sh b/tests/tap-summary-aux.sh
index feb98826e..022d1d7f2 100755
--- a/tests/tap-summary-aux.sh
+++ b/tests/tap-summary-aux.sh
@@ -28,7 +28,7 @@ esac
fetch_tap_driver
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([GNU AutoTAP], [5.12], [bug-automake@gnu.org])
AM_INIT_AUTOMAKE([parallel-tests])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/tar-override.test b/tests/tar-override.test
index bda62c48d..393bae8ba 100755
--- a/tests/tar-override.test
+++ b/tests/tar-override.test
@@ -23,7 +23,7 @@
cwd=`pwd` || fatal_ "couldn't get current working directory"
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > am--tar <<'END'
#!/bin/sh
diff --git a/tests/tar.test b/tests/tar.test
index 1e6a3f24e..263049ad0 100755
--- a/tests/tar.test
+++ b/tests/tar.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([tar], [1.0])
AM_INIT_AUTOMAKE([tar-ustar])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/tar2.test b/tests/tar2.test
index 0b62a7f09..f9cc00052 100755
--- a/tests/tar2.test
+++ b/tests/tar2.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([tar2], [1.0])
AM_INIT_AUTOMAKE([tar-pax])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/tar3.test b/tests/tar3.test
index 12126b4ce..ea46bb87b 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([tar2], [1.0])
AM_INIT_AUTOMAKE([tar-pax tar-v7])
AC_CONFIG_FILES([Makefile])
@@ -29,11 +29,11 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'configure.in:2:.*mutually exclusive' stderr
+grep 'configure.ac:2:.*mutually exclusive' stderr
rm -rf autom4te.cache
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT([tar2], [1.0])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index 82ead7d58..ad0e94d4f 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_OUTPUT
diff --git a/tests/targetclash.test b/tests/targetclash.test
index a2c841cc2..43e227da1 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/test-driver-acsubst.test b/tests/test-driver-acsubst.test
index 970a7b3d2..eefdd8154 100755
--- a/tests/test-driver-acsubst.test
+++ b/tests/test-driver-acsubst.test
@@ -27,7 +27,7 @@ cp "$testsrcdir"/trivial-test-driver test-drivers/triv \
cp "$am_scriptdir"/test-driver test-drivers/dflt \
|| fatal_ "failed to fetch auxiliary script test-driver"
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([LOG_DRIVER], ['${SHELL} test-drivers/triv'])
AC_SUBST([TEST_LOG_DRIVER], ['${SHELL} test-drivers/dflt'])
AC_SUBST([SH_LOG_DRIVER], ['${my_drv}'])
diff --git a/tests/test-driver-cond.test b/tests/test-driver-cond.test
index 932df5124..3129b9bd6 100755
--- a/tests/test-driver-cond.test
+++ b/tests/test-driver-cond.test
@@ -26,7 +26,7 @@ cp "$testsrcdir"/trivial-test-driver . \
cp "$am_scriptdir"/tap-driver.pl . \
|| fatal_ "failed to fetch auxiliary script tap-driver.pl"
-cat >> configure.in << END
+cat >> configure.ac << END
AM_CONDITIONAL([COND1], [:])
AM_CONDITIONAL([COND2], [false])
AM_CONDITIONAL([COND3], [false])
diff --git a/tests/test-driver-create-log-dir.test b/tests/test-driver-create-log-dir.test
index 15ed0cb5f..988331e4e 100755
--- a/tests/test-driver-create-log-dir.test
+++ b/tests/test-driver-create-log-dir.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-custom-multitest-recheck.test b/tests/test-driver-custom-multitest-recheck.test
index 7d9411d4f..4bf9c0040 100755
--- a/tests/test-driver-custom-multitest-recheck.test
+++ b/tests/test-driver-custom-multitest-recheck.test
@@ -28,7 +28,7 @@ am_parallel_tests=yes
cp "$testsrcdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-custom-multitest-recheck2.test b/tests/test-driver-custom-multitest-recheck2.test
index 17262d8b5..f6b15b9e4 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@ -27,7 +27,7 @@ am_parallel_tests=yes
cp "$testsrcdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-custom-multitest.test b/tests/test-driver-custom-multitest.test
index aa29ab85d..0ed00cd39 100755
--- a/tests/test-driver-custom-multitest.test
+++ b/tests/test-driver-custom-multitest.test
@@ -25,7 +25,7 @@ am_parallel_tests=yes
cp "$testsrcdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-custom-no-extra-driver.test b/tests/test-driver-custom-no-extra-driver.test
index 6bfe95292..b177181fb 100755
--- a/tests/test-driver-custom-no-extra-driver.test
+++ b/tests/test-driver-custom-no-extra-driver.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
AC_SUBST([X_LOG_DRIVER], [none])
diff --git a/tests/test-driver-custom-xfail-tests.test b/tests/test-driver-custom-xfail-tests.test
index 225c925b1..9a4e3fec5 100755
--- a/tests/test-driver-custom-xfail-tests.test
+++ b/tests/test-driver-custom-xfail-tests.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([nihil], [])
AC_SUBST([ac_xfail_tests], ['x5.test x6$(test_suffix)'])
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
diff --git a/tests/test-driver-custom.test b/tests/test-driver-custom.test
index 3fc7ab9ce..74e8a9e66 100755
--- a/tests/test-driver-custom.test
+++ b/tests/test-driver-custom.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-fail.test b/tests/test-driver-fail.test
index a9359da9a..0eb226800 100755
--- a/tests/test-driver-fail.test
+++ b/tests/test-driver-fail.test
@@ -25,7 +25,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/test-driver-is-distributed.test b/tests/test-driver-is-distributed.test
index 106c792cd..971b8bb97 100755
--- a/tests/test-driver-is-distributed.test
+++ b/tests/test-driver-is-distributed.test
@@ -35,7 +35,7 @@ do_check ()
mkdir $whereopts
cd $whereopts
mkdir tests
- unindent > configure.in << END
+ unindent > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([$auxdir])
AM_INIT_AUTOMAKE([$ac_opts])
diff --git a/tests/test-driver-strip-vpath.test b/tests/test-driver-strip-vpath.test
index f6b232b2c..21bd9c316 100755
--- a/tests/test-driver-strip-vpath.test
+++ b/tests/test-driver-strip-vpath.test
@@ -23,12 +23,12 @@ am_parallel_tests=yes
ocwd=`pwd` || fatal_ "cannot get current working directory"
mkdir src build
-mv install-sh missing configure.in src
+mv install-sh missing configure.ac src
rm -f depcomp
cd src
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-extensions-cond.test b/tests/test-extensions-cond.test
index 55fc4f4df..81808033a 100755
--- a/tests/test-extensions-cond.test
+++ b/tests/test-extensions-cond.test
@@ -19,7 +19,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [:])
AM_CONDITIONAL([COND2], [:])
END
diff --git a/tests/test-extensions.test b/tests/test-extensions.test
index d024619f1..d2fc2dd06 100755
--- a/tests/test-extensions.test
+++ b/tests/test-extensions.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/test-harness-vpath-rewrite.test b/tests/test-harness-vpath-rewrite.test
index 1ce483329..f0f71c66f 100755
--- a/tests/test-harness-vpath-rewrite.test
+++ b/tests/test-harness-vpath-rewrite.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-log.test b/tests/test-log.test
index 89d9ce852..d400b52bc 100755
--- a/tests/test-log.test
+++ b/tests/test-log.test
@@ -25,7 +25,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/test-logs-repeated.test b/tests/test-logs-repeated.test
index 07387869c..d75bbcb15 100755
--- a/tests/test-logs-repeated.test
+++ b/tests/test-logs-repeated.test
@@ -23,7 +23,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/test-metadata-global-log.test b/tests/test-metadata-global-log.test
index ce956d9a0..bbd933917 100755
--- a/tests/test-metadata-global-log.test
+++ b/tests/test-metadata-global-log.test
@@ -23,7 +23,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-metadata-global-result.test b/tests/test-metadata-global-result.test
index c3682a382..8a6020cc2 100755
--- a/tests/test-metadata-global-result.test
+++ b/tests/test-metadata-global-result.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-metadata-recheck.test b/tests/test-metadata-recheck.test
index 377971099..0a7a7ccb4 100755
--- a/tests/test-metadata-recheck.test
+++ b/tests/test-metadata-recheck.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-metadata-results.test b/tests/test-metadata-results.test
index 373b84f0e..91102a8b7 100755
--- a/tests/test-metadata-results.test
+++ b/tests/test-metadata-results.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-missing.test b/tests/test-missing.test
index ba618d6ac..9bca8fcfb 100755
--- a/tests/test-missing.test
+++ b/tests/test-missing.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-missing2.test b/tests/test-missing2.test
index c762dd61d..e511a8b4e 100755
--- a/tests/test-missing2.test
+++ b/tests/test-missing2.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/test-trs-basic.test b/tests/test-trs-basic.test
index 88015584f..53c26db4e 100755
--- a/tests/test-trs-basic.test
+++ b/tests/test-trs-basic.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/test-trs-recover.test b/tests/test-trs-recover.test
index 68a4d94e9..3ee6781d4 100755
--- a/tests/test-trs-recover.test
+++ b/tests/test-trs-recover.test
@@ -22,7 +22,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/test-trs-recover2.test b/tests/test-trs-recover2.test
index 7096b1f65..6fd9d1cbb 100755
--- a/tests/test-trs-recover2.test
+++ b/tests/test-trs-recover2.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_OUTPUT
END
diff --git a/tests/tests-environment-and-log-compiler.test b/tests/tests-environment-and-log-compiler.test
index 3767790a9..0e9d6e737 100755
--- a/tests/tests-environment-and-log-compiler.test
+++ b/tests/tests-environment-and-log-compiler.test
@@ -21,7 +21,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/tests-environment-backcompat.test b/tests/tests-environment-backcompat.test
index af2b5d5a7..f773cbdf6 100755
--- a/tests/tests-environment-backcompat.test
+++ b/tests/tests-environment-backcompat.test
@@ -22,7 +22,7 @@
am_parallel_tests=no
. ./defs || Exit 1
-cat >> configure.in <<END
+cat >> configure.ac <<END
AC_SUBST([PERL], ['$PERL'])
AC_OUTPUT
END
diff --git a/tests/tests-environment-fd-redirect.test b/tests/tests-environment-fd-redirect.test
index dc5886fdd..0361affea 100755
--- a/tests/tests-environment-fd-redirect.test
+++ b/tests/tests-environment-fd-redirect.test
@@ -29,7 +29,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/tests-environment.test b/tests/tests-environment.test
index 87b097530..27cd458f2 100755
--- a/tests/tests-environment.test
+++ b/tests/tests-environment.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/testsuite-summary-checks.sh b/tests/testsuite-summary-checks.sh
index 1ed2b3276..e126bd5c6 100755
--- a/tests/testsuite-summary-checks.sh
+++ b/tests/testsuite-summary-checks.sh
@@ -36,7 +36,7 @@ case $use_colors in
fatal_ "invalid use_colors='$use_colors'";;
esac
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([GNU AutoFoo], [7.1], [bug-automake@gnu.org])
AM_INIT_AUTOMAKE([$am_opts])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/testsuite-summary-count-many.test b/tests/testsuite-summary-count-many.test
index 5e8a29583..43c2b65e5 100755
--- a/tests/testsuite-summary-count-many.test
+++ b/tests/testsuite-summary-count-many.test
@@ -38,7 +38,7 @@ ${br}
See ./test-suite.log
${br}"
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
TEST_LOG_DRIVER = $(SHELL) $(srcdir)/trivial-test-driver
diff --git a/tests/testsuite-summary-reference-log.test b/tests/testsuite-summary-reference-log.test
index e5678fa02..480ec12d6 100755
--- a/tests/testsuite-summary-reference-log.test
+++ b/tests/testsuite-summary-reference-log.test
@@ -20,7 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
-mv configure.in configure.stub
+mv configure.ac configure.stub
cat > fail << 'END'
#!/bin/sh
@@ -28,7 +28,7 @@ exit 1
END
chmod a+x fail
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_OUTPUT
END
@@ -62,7 +62,7 @@ mkdir sub
echo TESTS = fail > sub/Makefile.am
mv fail sub
-cat configure.stub - > configure.in <<'END'
+cat configure.stub - > configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/transform.test b/tests/transform.test
index acb49a3af..7aa958ea0 100755
--- a/tests/transform.test
+++ b/tests/transform.test
@@ -19,7 +19,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/transform2.test b/tests/transform2.test
index 2b27b45b3..a4a94f7a9 100755
--- a/tests/transform2.test
+++ b/tests/transform2.test
@@ -20,7 +20,7 @@
required=cc
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_CC
AC_OUTPUT
END
diff --git a/tests/txinfo.test b/tests/txinfo.test
index 40c92c5e3..e6667cbed 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -20,7 +20,7 @@
required=makeinfo
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_OUTPUT
END
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
index 625dd107d..77f9af785 100755
--- a/tests/txinfo13.test
+++ b/tests/txinfo13.test
@@ -21,7 +21,7 @@
required='makeinfo tex texi2dvi-o'
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
info_TEXINFOS = subdir/main.texi
diff --git a/tests/txinfo16.test b/tests/txinfo16.test
index c1b3fe7ea..7ed194e80 100755
--- a/tests/txinfo16.test
+++ b/tests/txinfo16.test
@@ -20,7 +20,7 @@
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
index c0d188125..22b096ba2 100755
--- a/tests/txinfo18.test
+++ b/tests/txinfo18.test
@@ -21,7 +21,7 @@
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo19.test b/tests/txinfo19.test
index c94775394..e304b42e2 100755
--- a/tests/txinfo19.test
+++ b/tests/txinfo19.test
@@ -19,7 +19,7 @@
required='makeinfo tex'
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
info_TEXINFOS = main.texi
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
index a33bf7e40..0daebd9a8 100755
--- a/tests/txinfo2.test
+++ b/tests/txinfo2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo20.test b/tests/txinfo20.test
index 2fd4cdf65..5c07880c1 100755
--- a/tests/txinfo20.test
+++ b/tests/txinfo20.test
@@ -19,7 +19,7 @@
required=makeinfo
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
info_TEXINFOS = main.texi sub/main.texi
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index 5e1148c75..93543a785 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -20,7 +20,7 @@
required='makeinfo-html tex texi2dvi'
. ./defs || Exit 1
-cat >>configure.in <<\EOF
+cat >>configure.ac <<\EOF
AC_CONFIG_FILES([rec/Makefile])
# At the time of writing, Autoconf does not supplies any of these
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 0b90e853e..c33898b67 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -21,7 +21,7 @@
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([aux1])
AM_INIT_AUTOMAKE
diff --git a/tests/txinfo23.test b/tests/txinfo23.test
index 1693b82c4..e5c17611d 100755
--- a/tests/txinfo23.test
+++ b/tests/txinfo23.test
@@ -22,7 +22,7 @@
required='makeinfo tex texi2dvi-o'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo24.test b/tests/txinfo24.test
index f62e14a91..709cee71f 100755
--- a/tests/txinfo24.test
+++ b/tests/txinfo24.test
@@ -21,7 +21,7 @@
required='makeinfo tex texi2dvi-o'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo25.test b/tests/txinfo25.test
index 5cdd29381..cb6abaac0 100755
--- a/tests/txinfo25.test
+++ b/tests/txinfo25.test
@@ -23,7 +23,7 @@
required='makeinfo tex texi2dvi-o'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo26.test b/tests/txinfo26.test
index b958aaff8..e336bba79 100755
--- a/tests/txinfo26.test
+++ b/tests/txinfo26.test
@@ -20,7 +20,7 @@
required='makeinfo'
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
info_TEXINFOS = main.texi
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
index ecd98c625..131300ae9 100755
--- a/tests/txinfo27.test
+++ b/tests/txinfo27.test
@@ -19,7 +19,7 @@
required='makeinfo'
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
info_TEXINFOS = main.texi
diff --git a/tests/txinfo28.test b/tests/txinfo28.test
index 058e47cf4..97b36d50a 100755
--- a/tests/txinfo28.test
+++ b/tests/txinfo28.test
@@ -27,7 +27,7 @@ required='makeinfo tex texi2dvi-o'
TIME_STYLE="+%Y-%m-%d %H:%M:%S"
export TIME_STYLE
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
MA = ma
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index cf6112faa..a0013d252 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.test
@@ -43,13 +43,13 @@ grep '^INFO_DEPS *= *foo.info *$' Makefile.in
cat > Makefile.am << 'END'
info_TEXINFOS = bar.texi
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_SUBST([INFO_DEPS])
END
-rm -rf autom4te.cache # Make sure autoconf sees the configure.in update.
+rm -rf autom4te.cache # Make sure autoconf sees the configure.ac update.
AUTOMAKE_fails
-grep '^configure\.in:4:.*user variable.*INFO_DEPS' stderr
+grep '^configure\.ac:4:.*user variable.*INFO_DEPS' stderr
grep 'overrides Automake variable.*INFO_DEPS' stderr
$AUTOMAKE -Wno-override
diff --git a/tests/txinfo3.test b/tests/txinfo3.test
index b662defdf..88e1bacfe 100755
--- a/tests/txinfo3.test
+++ b/tests/txinfo3.test
@@ -19,7 +19,7 @@
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo30.test b/tests/txinfo30.test
index 799cefceb..b85ef0fa8 100755
--- a/tests/txinfo30.test
+++ b/tests/txinfo30.test
@@ -26,7 +26,7 @@ cat >bar.texi <<EOF
@setfilename bar.info
EOF
-echo AC_OUTPUT >>configure.in
+echo AC_OUTPUT >>configure.ac
cat >makeinfo <<\EOF
#!/bin/sh
diff --git a/tests/txinfo32.test b/tests/txinfo32.test
index 8c25bedfe..7fa793858 100755
--- a/tests/txinfo32.test
+++ b/tests/txinfo32.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
mkdir sub
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/txinfo33.test b/tests/txinfo33.test
index 30f34f989..d7248249a 100755
--- a/tests/txinfo33.test
+++ b/tests/txinfo33.test
@@ -22,7 +22,7 @@ required='makeinfo tex texi2dvi-o dvips'
mkdir sub
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index e4aa1f6f1..da32cb61f 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -22,7 +22,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
END
diff --git a/tests/txinfo5b.test b/tests/txinfo5b.test
index d4e0b19dc..a52be5a86 100755
--- a/tests/txinfo5b.test
+++ b/tests/txinfo5b.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
END
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index e8f6107b4..4b186bc38 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
AM_INIT_AUTOMAKE
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index 640ef711e..69154bb0c 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -39,7 +39,7 @@ else
rm_f_is_silent_on_error=yes
fi
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/uninstall-pr9578.test b/tests/uninstall-pr9578.test
index ba961f9ce..1ba6ac7ed 100755
--- a/tests/uninstall-pr9578.test
+++ b/tests/uninstall-pr9578.test
@@ -24,7 +24,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/tests/unused.test b/tests/unused.test
index 5852f75a8..271273fe5 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
MACRO_1
MACRO_1_2
MACRO_1_2_3
diff --git a/tests/upc.test b/tests/upc.test
index 6b467bc9e..320e02fc7 100755
--- a/tests/upc.test
+++ b/tests/upc.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AM_PROG_UPC
AC_OUTPUT
END
diff --git a/tests/upc2.test b/tests/upc2.test
index 01a8ca700..43575d8cb 100755
--- a/tests/upc2.test
+++ b/tests/upc2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-echo AC_PROG_CC >>configure.in
+echo AC_PROG_CC >>configure.ac
cat >Makefile.am <<'END'
bin_PROGRAMS = hello
diff --git a/tests/upc3.test b/tests/upc3.test
index 91826a911..eb026792c 100755
--- a/tests/upc3.test
+++ b/tests/upc3.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_UPC
AC_OUTPUT
diff --git a/tests/vala-mix.test b/tests/vala-mix.test
index b1d1bafdb..acf47d989 100755
--- a/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@ -19,7 +19,7 @@
required='valac cc GNUmake'
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_VALAC
diff --git a/tests/vala-vpath.test b/tests/vala-vpath.test
index 54f9e452e..636e66ec6 100755
--- a/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@ -20,7 +20,7 @@
required="valac GNUmake"
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([hello.vala])
AC_PROG_CC
AM_PROG_VALAC([0.7])
diff --git a/tests/vala.test b/tests/vala.test
index b68fd7878..b4e2d7656 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -24,7 +24,7 @@ AC_DEFUN([AC_PROG_LIBTOOL],
[AC_SUBST([LIBTOOL], [:])])
END
-cat >> 'configure.in' << 'END'
+cat >> 'configure.ac' << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_LIBTOOL
diff --git a/tests/vala1.test b/tests/vala1.test
index e5d31fcdb..9aca0fbc3 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -20,7 +20,7 @@
required="libtool"
. ./defs || Exit 1
-cat >> 'configure.in' << 'END'
+cat >> 'configure.ac' << 'END'
AC_PROG_CC
AM_PROG_AR
AC_PROG_LIBTOOL
diff --git a/tests/vala2.test b/tests/vala2.test
index d5bf687ac..cceed5495 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -21,7 +21,7 @@ required="libtool libtoolize pkg-config valac gcc GNUmake"
mkdir src
-cat >> 'configure.in' << 'END'
+cat >> 'configure.ac' << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_LIBTOOL
diff --git a/tests/vala3.test b/tests/vala3.test
index ca985bb9e..c93db9a9b 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -21,7 +21,7 @@ required="libtool libtoolize pkg-config valac gcc GNUmake"
mkdir src
-cat >> 'configure.in' << 'END'
+cat >> 'configure.ac' << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_LIBTOOL
diff --git a/tests/vala4.test b/tests/vala4.test
index f1ce2cca5..3fc06bc9f 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -19,7 +19,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AM_PROG_VALAC([0.0.1])
@@ -48,13 +48,13 @@ $AUTOMAKE -a
$AUTOCONF
./configure "VALAC=$cwd/valac" || Exit $?
-sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.in >t
-mv -f t configure.in
+sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.ac >t
+mv -f t configure.ac
$AUTOCONF --force
./configure "VALAC=$cwd/valac" && Exit 1
-sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.in >t
-mv -f t configure.in
+sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.ac >t
+mv -f t configure.ac
$AUTOCONF --force
./configure "VALAC=$cwd/valac" || Exit $?
diff --git a/tests/vala5.test b/tests/vala5.test
index 7c1a9ac76..79fb31623 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -21,7 +21,7 @@ required="pkg-config valac gcc GNUmake"
mkdir src
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.0])
diff --git a/tests/vartypo2.test b/tests/vartypo2.test
index c58a62677..9b52df683 100755
--- a/tests/vartypo2.test
+++ b/tests/vartypo2.test
@@ -20,7 +20,7 @@
required=libtoolize
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AM_PROG_AR
AC_PROG_LIBTOOL
AC_OUTPUT
diff --git a/tests/vartypos.test b/tests/vartypos.test
index f356385b3..e3ea16e43 100755
--- a/tests/vartypos.test
+++ b/tests/vartypos.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<'END'
+cat >>configure.ac <<'END'
AC_PROG_RANLIB
AC_OUTPUT
END
diff --git a/tests/version.test b/tests/version.test
index d7fbc03f5..98664e28c 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE([sh-utils], [1.12o])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/version2.test b/tests/version2.test
index 8a28227ce..71749f64b 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
+cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE([sh-utils], [1.12o], [no])
AC_CONFIG_FILES([Makefile])
diff --git a/tests/version7.test b/tests/version7.test
index 96547e29f..28929204b 100755
--- a/tests/version7.test
+++ b/tests/version7.test
@@ -15,14 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test for a special setup where the package's version isn't defined
-# in configure.in. We want GNU Make for this test (part of the test
+# in configure.ac. We want GNU Make for this test (part of the test
# is to make sure Makefile.ins get rebuilt when a m4_included file
# changes -- we don't support this feature on non-GNU Makes).
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
-cat >configure.in <<END
+cat >configure.ac <<END
m4_include([version.m4])
AC_INIT([$me], [THE_VERSION])
AM_INIT_AUTOMAKE
diff --git a/tests/version8.test b/tests/version8.test
index ace527c6b..1e66280d4 100755
--- a/tests/version8.test
+++ b/tests/version8.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.in
+echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.ac
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 0; }
cat stderr >&2
$FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
index b51e145dd..679199d5b 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -30,7 +30,7 @@ distdir=$me-7.45.3a
TEX=false TEXI2DVI=false MAKEINFO=false
export TEX TEXI2DVI MAKEINFO
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [7.45.3a])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/vtexi4.test b/tests/vtexi4.test
index ed4c6fee9..b422522ea 100755
--- a/tests/vtexi4.test
+++ b/tests/vtexi4.test
@@ -38,7 +38,7 @@ day=`echo "$day" | sed 's/^0//'`
(echo 'x' | grep x) \
|| skip_ "grep doesn't work on input that is not pure text"
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [123.456])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
diff --git a/tests/warning-groups-win-over-strictness.test b/tests/warning-groups-win-over-strictness.test
index ec8f9b052..331b3e64c 100755
--- a/tests/warning-groups-win-over-strictness.test
+++ b/tests/warning-groups-win-over-strictness.test
@@ -27,7 +27,7 @@ AUTOMAKE=$am_original_AUTOMAKE
# Files required in gnu and/or gnits strictness.
touch README INSTALL NEWS AUTHORS ChangeLog COPYING THANKS
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
m4_include([am-init-automake.m4])
AC_PROG_CC
diff --git a/tests/warnings-override.test b/tests/warnings-override.test
index 475a1bd9c..9f973c6db 100755
--- a/tests/warnings-override.test
+++ b/tests/warnings-override.test
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The warnings specified in Makefile.am:AUTOMAKE_OPTIONS should override
-# those specified in configure.in:AM_INIT_AUTOMAKE, and both should
+# those specified in configure.ac:AM_INIT_AUTOMAKE, and both should
# override the warnings specified on the command line.
# NOTE: the current semantics might not be the best one (even if it has
# been in place for quite a long time); see also Automake bug #7673.
@@ -59,52 +59,52 @@ touch README INSTALL NEWS AUTHORS ChangeLog COPYING
rm -rf autom4te*.cache
set_warnings '-Wno-portability' Makefile.am
-set_warnings '' configure.in
+set_warnings '' configure.ac
ok -Wportability
ok
rm -rf autom4te*.cache
set_warnings '' Makefile.am
-set_warnings '-Wno-portability' configure.in
+set_warnings '-Wno-portability' configure.ac
ok -Wportability
ok
rm -rf autom4te*.cache
set_warnings '-Wno-portability' Makefile.am
-set_warnings '-Wno-portability' configure.in
+set_warnings '-Wno-portability' configure.ac
ok -Wportability
rm -rf autom4te*.cache
set_warnings '-Wportability' Makefile.am
-set_warnings '' configure.in
+set_warnings '' configure.ac
ko
ko -Wno-portability
rm -rf autom4te*.cache
set_warnings '' Makefile.am
-set_warnings '-Wportability' configure.in
+set_warnings '-Wportability' configure.ac
ko
ko -Wno-portability
rm -rf autom4te*.cache
set_warnings '-Wportability' Makefile.am
-set_warnings '-Wportability' configure.in
+set_warnings '-Wportability' configure.ac
ko -Wno-portability
rm -rf autom4te*.cache
set_warnings '-Wno-portability' Makefile.am
-set_warnings '-Wportability' configure.in
+set_warnings '-Wportability' configure.ac
ok
ok -Wportability
rm -rf autom4te*.cache
set_warnings '-Wportability' Makefile.am
-set_warnings '-Wno-portability' configure.in
+set_warnings '-Wno-portability' configure.ac
ko
ko -Wno-portability
diff --git a/tests/warnings-precedence.test b/tests/warnings-precedence.test
index 2b2152f89..a5886701a 100755
--- a/tests/warnings-precedence.test
+++ b/tests/warnings-precedence.test
@@ -57,16 +57,16 @@ ok -Wportability -Wno-portability
ko -Wno-portability -Wportability
set_warnings '' Makefile.am
-set_warnings '-Wportability -Wno-portability' configure.in
+set_warnings '-Wportability -Wno-portability' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
ok
-set_warnings '-Wno-portability -Wportability' configure.in
+set_warnings '-Wno-portability -Wportability' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
ko
-set_warnings '' configure.in
+set_warnings '' configure.ac
rm -rf autom4te*.cache
$ACLOCAL
set_warnings '-Wportability -Wno-portability' Makefile.am
diff --git a/tests/warnings-strictness-interactions.test b/tests/warnings-strictness-interactions.test
index 5dfb2db5b..774fd3aae 100755
--- a/tests/warnings-strictness-interactions.test
+++ b/tests/warnings-strictness-interactions.test
@@ -38,7 +38,7 @@ set_am_opts ()
cat $2
}
-set_am_opts '-Wportability' configure.in
+set_am_opts '-Wportability' configure.ac
set_am_opts 'foreign' Makefile.am
$ACLOCAL
@@ -49,7 +49,7 @@ rm -rf autom4te*.cache
# Files required in gnu strictness.
touch README INSTALL NEWS AUTHORS ChangeLog COPYING
-set_am_opts '-Wno-portability' configure.in
+set_am_opts '-Wno-portability' configure.ac
set_am_opts 'gnu' Makefile.am
AUTOMAKE_fails
diff --git a/tests/warnings-unknown.test b/tests/warnings-unknown.test
index bddbb259f..4d64059e0 100755
--- a/tests/warnings-unknown.test
+++ b/tests/warnings-unknown.test
@@ -21,7 +21,7 @@
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-cat > configure.in <<END
+cat > configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([-Wno-zardoz])
AC_CONFIG_FILES([Makefile])
@@ -38,7 +38,7 @@ AUTOMAKE_fails -Wbazquux
sed "s/^automake:/automake-$APIVERSION:/" stderr > t
mv -f t stderr
cat stderr >&2
-grep '^configure\.in:2:.* unknown warning category.*zardoz' stderr
+grep '^configure\.ac:2:.* unknown warning category.*zardoz' stderr
grep '^Makefile\.am:1:.* unknown warning category.*foobar' stderr
grep "^automake-$APIVERSION:.* unknown warning category.*bazquux" stderr
diff --git a/tests/warnings-win-over-strictness.test b/tests/warnings-win-over-strictness.test
index 72eebad47..5d47f5047 100755
--- a/tests/warnings-win-over-strictness.test
+++ b/tests/warnings-win-over-strictness.test
@@ -63,20 +63,20 @@ ok -Wno-portability --gnu
set_am_opts '' Makefile.am
rm -rf autom4te*.cache
-set_am_opts 'foreign -Wportability' configure.in
+set_am_opts 'foreign -Wportability' configure.ac
ko
rm -rf autom4te*.cache
-set_am_opts '-Wportability foreign' configure.in
+set_am_opts '-Wportability foreign' configure.ac
ko
rm -rf autom4te*.cache
-set_am_opts 'gnu -Wno-portability' configure.in
+set_am_opts 'gnu -Wno-portability' configure.ac
ok
rm -rf autom4te*.cache
-set_am_opts '-Wno-portability gnu' configure.in
+set_am_opts '-Wno-portability gnu' configure.ac
ok
rm -rf autom4te*.cache
-set_am_opts '' configure.in
+set_am_opts '' configure.ac
set_am_opts 'foreign -Wportability' Makefile.am
ko
diff --git a/tests/warnopts.test b/tests/warnopts.test
index 54c27d589..bb9cfb3e0 100755
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<END
+cat >>configure.ac <<END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
@@ -55,15 +55,15 @@ grep '^Makefile.am:.*INCLUDES' stderr && Exit 1
test `grep -v 'warnings are treated as errors' stderr | wc -l` = 3
# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.in
-# created below; thus causing traces for the old configure.in to be
+# $AUTOMAKE is likely to have the same time stamp as the configure.ac
+# created below; thus causing traces for the old configure.ac to be
# used. We could do `$sleep', but it's faster to erase the
# directory. (Erase autom4te*.cache, not autom4te.cache, because some
# bogus installations of Autoconf use a versioned cache).
rm -rf autom4te*.cache
# If we add a global -Wnone, all warnings should disappear.
-cat >configure.in <<END
+cat >configure.ac <<END
AC_INIT([warnopts], [1.0])
AM_INIT_AUTOMAKE([-Wnone])
AC_CONFIG_FILES([Makefile sub/Makefile])
diff --git a/tests/werror2.test b/tests/werror2.test
index 302d26aad..67e0e01f7 100755
--- a/tests/werror2.test
+++ b/tests/werror2.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-echo AC_OUTPUT>>configure.in
+echo AC_OUTPUT>>configure.ac
: > Makefile.am
diff --git a/tests/werror3.test b/tests/werror3.test
index 75da9761f..b5e35e370 100755
--- a/tests/werror3.test
+++ b/tests/werror3.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >>configure.in <<\END
+cat >>configure.ac <<\END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/werror4.test b/tests/werror4.test
index 9dd067280..b2f3f6a78 100755
--- a/tests/werror4.test
+++ b/tests/werror4.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >>configure.in <<\END
+cat >>configure.ac <<\END
AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
diff --git a/tests/whoami.test b/tests/whoami.test
index 175f02b3e..72153cada 100755
--- a/tests/whoami.test
+++ b/tests/whoami.test
@@ -20,7 +20,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
WHO_AM_I=17
END
diff --git a/tests/xsource.test b/tests/xsource.test
index 39dbbecbd..5f89dc9c6 100755
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -24,7 +24,7 @@ bin_PROGRAMS = zardoz
zardoz_SOURCES = z.c x/z.c
END
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
END
diff --git a/tests/yacc-auxdir.test b/tests/yacc-auxdir.test
index e58d9a469..d268fc586 100755
--- a/tests/yacc-auxdir.test
+++ b/tests/yacc-auxdir.test
@@ -23,7 +23,7 @@ set -e
mkdir aux1 sub
-cat > configure.in << END
+cat > configure.ac << END
AC_INIT([$me], [1.0])
# 'aux' is not an acceptable file/directory name on Windows systems
AC_CONFIG_AUX_DIR([aux1])
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index ff233c03a..6d1edfd85 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -20,7 +20,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-bison-skeleton-cxx.test b/tests/yacc-bison-skeleton-cxx.test
index 0d3c99b8a..63ed60800 100755
--- a/tests/yacc-bison-skeleton-cxx.test
+++ b/tests/yacc-bison-skeleton-cxx.test
@@ -22,7 +22,7 @@ required=bison
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-bison-skeleton.test b/tests/yacc-bison-skeleton.test
index aa606585a..c42063c2e 100755
--- a/tests/yacc-bison-skeleton.test
+++ b/tests/yacc-bison-skeleton.test
@@ -22,7 +22,7 @@ required=bison
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-clean-cxx.test b/tests/yacc-clean-cxx.test
index 1abbfba7c..5fc815e6b 100755
--- a/tests/yacc-clean-cxx.test
+++ b/tests/yacc-clean-cxx.test
@@ -25,7 +25,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
diff --git a/tests/yacc-clean.test b/tests/yacc-clean.test
index ba230072e..4ecd5b1d0 100755
--- a/tests/yacc-clean.test
+++ b/tests/yacc-clean.test
@@ -22,7 +22,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
index 71fb61ccb..4e4ec9dd4 100755
--- a/tests/yacc-cxx.test
+++ b/tests/yacc-cxx.test
@@ -23,7 +23,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index 933b2bd09..6c75663cb 100755
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -21,7 +21,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile])
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index 21d830200..a9862a023 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -55,7 +55,7 @@ write_main ()
END
}
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile qux/Makefile])
diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index bbd5c3647..dd7487748 100755
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -25,7 +25,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-deleted-headers.test b/tests/yacc-deleted-headers.test
index 146eafddb..ec275180a 100755
--- a/tests/yacc-deleted-headers.test
+++ b/tests/yacc-deleted-headers.test
@@ -21,7 +21,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-depend.test b/tests/yacc-depend.test
index 5cd4f15ba..8a3c0eef7 100755
--- a/tests/yacc-depend.test
+++ b/tests/yacc-depend.test
@@ -22,7 +22,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-depend2.test b/tests/yacc-depend2.test
index b067e6997..205c21ca7 100755
--- a/tests/yacc-depend2.test
+++ b/tests/yacc-depend2.test
@@ -23,7 +23,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-dist-nobuild-subdir.test b/tests/yacc-dist-nobuild-subdir.test
index c02a10073..67568d797 100755
--- a/tests/yacc-dist-nobuild-subdir.test
+++ b/tests/yacc-dist-nobuild-subdir.test
@@ -25,7 +25,7 @@ required=yacc
# triggers automake bug#7884.
useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_YACC
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index 0d678f195..bdfaca6e1 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -21,7 +21,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc-line.test b/tests/yacc-line.test
index 4475b0857..1959048e5 100755
--- a/tests/yacc-line.test
+++ b/tests/yacc-line.test
@@ -24,7 +24,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/yacc-mix-c-cxx.test b/tests/yacc-mix-c-cxx.test
index 722a01c19..62f326003 100755
--- a/tests/yacc-mix-c-cxx.test
+++ b/tests/yacc-mix-c-cxx.test
@@ -22,7 +22,7 @@ required=yacc
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc-nodist.test b/tests/yacc-nodist.test
index 619ed878b..2124357d5 100755
--- a/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@ -23,7 +23,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
diff --git a/tests/yacc-pr204.test b/tests/yacc-pr204.test
index 30fff2ab3..fa8d4640b 100755
--- a/tests/yacc-pr204.test
+++ b/tests/yacc-pr204.test
@@ -23,7 +23,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
AM_MAINTAINER_MODE
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-weirdnames.test b/tests/yacc-weirdnames.test
index 6fa19ccd1..909b018f8 100755
--- a/tests/yacc-weirdnames.test
+++ b/tests/yacc-weirdnames.test
@@ -21,7 +21,7 @@
set -e
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc.test b/tests/yacc.test
index 8829e8b2a..60b5a4ffc 100755
--- a/tests/yacc.test
+++ b/tests/yacc.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
END
diff --git a/tests/yacc2.test b/tests/yacc2.test
index a0c671e84..95784623c 100755
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -20,13 +20,13 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
END
# Run it here once and for all, since we are not going to modify
-# configure.in anymore.
+# configure.ac anymore.
$ACLOCAL
cat > Makefile.am <<'END'
diff --git a/tests/yacc4.test b/tests/yacc4.test
index 7c87c539b..3f9a20478 100755
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -19,7 +19,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc5.test b/tests/yacc5.test
index 4aa1c8091..ab24b563d 100755
--- a/tests/yacc5.test
+++ b/tests/yacc5.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_YACC
diff --git a/tests/yacc7.test b/tests/yacc7.test
index 5dc01021d..c7cd40e41 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -23,7 +23,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yacc8.test b/tests/yacc8.test
index ad841bc93..bab627dfb 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -20,7 +20,7 @@ required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_YACC
diff --git a/tests/yaccdry.test b/tests/yaccdry.test
index 92f506aa5..445eb1235 100755
--- a/tests/yaccdry.test
+++ b/tests/yaccdry.test
@@ -19,7 +19,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yaccpp.test b/tests/yaccpp.test
index 0f12331b2..c3a8b2571 100755
--- a/tests/yaccpp.test
+++ b/tests/yaccpp.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
END
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index d11fbaf14..3ad8454b0 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -25,7 +25,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yflags-cmdline-override.test b/tests/yflags-cmdline-override.test
index 7ad63cb9b..d42fa521c 100755
--- a/tests/yflags-cmdline-override.test
+++ b/tests/yflags-cmdline-override.test
@@ -22,7 +22,7 @@ required='cc yacc'
unset YFLAGS || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yflags-conditional.test b/tests/yflags-conditional.test
index 40f040fca..c0b5a1982 100755
--- a/tests/yflags-conditional.test
+++ b/tests/yflags-conditional.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
# `YFLAGS' is AC_SUBST'd by AC_PROG_YACC by default, but we
diff --git a/tests/yflags-d-false-positives.test b/tests/yflags-d-false-positives.test
index 0f497d01f..97b01f5e1 100755
--- a/tests/yflags-d-false-positives.test
+++ b/tests/yflags-d-false-positives.test
@@ -18,7 +18,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_YACC
END
diff --git a/tests/yflags-force-conditional.test b/tests/yflags-force-conditional.test
index c58753726..53038a82a 100755
--- a/tests/yflags-force-conditional.test
+++ b/tests/yflags-force-conditional.test
@@ -19,7 +19,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([CC], [false])
AC_PROG_YACC
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
diff --git a/tests/yflags-force-override.test b/tests/yflags-force-override.test
index e792d0211..3f4755ed1 100755
--- a/tests/yflags-force-override.test
+++ b/tests/yflags-force-override.test
@@ -21,7 +21,7 @@
required='cc yacc'
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
diff --git a/tests/yflags-var-expand.test b/tests/yflags-var-expand.test
index af7ede8c1..bf9198e8a 100755
--- a/tests/yflags-var-expand.test
+++ b/tests/yflags-var-expand.test
@@ -21,7 +21,7 @@
. ./defs || Exit 1
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_YACC
END
diff --git a/tests/yflags.test b/tests/yflags.test
index 38064a00e..5101eedc9 100755
--- a/tests/yflags.test
+++ b/tests/yflags.test
@@ -32,7 +32,7 @@ chmod a+x fake-yacc
# with `make -e' below.
unset YACC || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([CC], [false])
# Simulate presence of Yacc using our fake-yacc script.
AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
diff --git a/tests/yflags2.test b/tests/yflags2.test
index ac784fa1b..d9cf5ed15 100755
--- a/tests/yflags2.test
+++ b/tests/yflags2.test
@@ -32,7 +32,7 @@ chmod a+x fake-yacc
# with `make -e' below.
unset YACC || :
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
AC_SUBST([CXX], [false])
# Simulate presence of Yacc using our fake-yacc script.
AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])