Merge branch 'master' into ng/master

* master:
  tests: prefer 'configure.ac' over 'configure.in'
  coverage: expose automake bug#7868
  tests: remove obsoleted "icc" requirement
  readme: fix typo in tests/README

diff --cc syntax-checks.mk
index 0b730d451d425db1c636b1eef7863cc93a1e8a2a,254c3ab6b55987fa053af61456a21a2ce467c4fd..d6ab291108dcedf6ae6f1da67e3e7702af8acd85
--- 1/syntax-checks.mk
--- 2/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -77,8 -68,10 +77,9 @@@ sc_tests_automake_fails 
  sc_tests_plain_aclocal \
  sc_tests_plain_perl \
  sc_tests_required_after_defs \
 -sc_tests_overriding_macros_on_cmdline \
  sc_tests_plain_sleep \
  sc_tests_plain_egrep_fgrep \
+ sc_tests_no_configure_in \
  sc_tests_PATH_SEPARATOR \
  sc_tests_logs_duplicate_prefixes \
  sc_tests_makefile_variable_order \

diff --cc tests/Makefile.am
index da7a68d66b51981eae7033034caa2f6b623fc457,8a77681fcbfd5cb7dc3e00cfb3355f2402eb5525..6ef271aaf24924aad154b4ae57154d80291f99e3
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -42,7 -41,9 +42,8 @@@ interp3.test 
  override-conditional-2.test \
  java-nobase.test \
  objext-pr10128.test \
+ parallel-tests-many.test \
  pr8365-remake-timing.test \
 -lex-subobj-nodep.test \
  remake-am-pr10111.test \
  remake-m4-pr10111.test \
  txinfo5.test \

diff --cc tests/README
index 08d06cfdfdad2fca616220884cd5880bb0e3f58f,9d0b4f23feb677f7116b7638317b898a53b6d053..70d5873cc8e13b0bdd085a5141fe45f972e7d738
--- 1/tests/README
--- 2/tests/README
+++ b/tests/README
@@@ -237,15 -238,15 +237,15 @@@ D
    Use `$PATH_SEPARATOR', not hard-coded `:', as the separator of
    PATH's entries.
  
 -  It's more important to make sure that a feature works, than
 -  make sure that Automake's output looks correct.  It might look
 -  correct and still fail to work.  In other words, prefer
 -  running `make' over grepping `Makefile.in' (or do both).
 +  It's more important to make sure that a feature works, than make sure
 +  that the output of Automake-NG looks correct.  It might look correct
 +  and still fail to work.  In other words, prefer 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 --cc tests/aclocal4.test
Simple merge

diff --cc tests/amopts-variable-expansion.test
Simple merge

diff --cc tests/canon.test
Simple merge

diff --cc tests/canon5.test
Simple merge

diff --cc tests/check-concurrency-bug9245.test
Simple merge

diff --cc tests/check10.test
Simple merge

diff --cc tests/check11.test
Simple merge

diff --cc tests/check12.test
Simple merge

diff --cc tests/check4.test
Simple merge

diff --cc tests/check5.test
Simple merge

diff --cc tests/check7.test
Simple merge

diff --cc tests/check8.test
Simple merge

diff --cc tests/color.test
Simple merge

diff --cc tests/conffile-leading-dot.test
index d9d299f8bdc0d0712da4492f3a05bdb2a36d3d46,9c4cb4fff2b43e29c58f9a6e2a90fc6430bf6aac..3c5ba9753e5143fd99fd1868382a4a2502a8d653
--- 1/tests/conffile-leading-dot.test
--- 2/tests/conffile-leading-dot.test
+++ b/tests/conffile-leading-dot.test
@@@ -18,9 -18,10 +18,9 @@@
  # with a dot (like "./Makefile"), since the remake rules might be subtly
  # broken in that case.
  
 -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])

diff --cc tests/cscope.tap
Simple merge

diff --cc tests/defs
Simple merge

diff --cc tests/depend.test
Simple merge

diff --cc tests/depend4.test
Simple merge

diff --cc tests/distcheck-configure-flags.test
Simple merge

diff --cc tests/distcheck-hook.test
Simple merge

diff --cc tests/distcheck-hook2.test
Simple merge

diff --cc tests/distcheck-missing-m4.test
Simple merge

diff --cc tests/distcheck-outdated-m4.test
Simple merge

diff --cc tests/distcheck-override-infodir.test
Simple merge

diff --cc tests/distdir.test
Simple merge

diff --cc tests/distlinksbrk.test
Simple merge

diff --cc tests/dollar.test
index 5d0018099ea060750390fdecdad113bfdeebc354,2747e5d8c126ad3e7acbd5c39b32de8a9a597a6e..baa89f5127eea0d282cef8b8b516e5a30abf6b32
--- 1/tests/dollar.test
--- 2/tests/dollar.test
+++ b/tests/dollar.test
@@@ -20,9 -20,10 +20,9 @@@
  
  # Require GNU make for this test.  SunOS Make does not support
  # `$$' in a target or a dependency (it outputs the empty string instead).
 -required=GNUmake
  . ./defs || Exit 1
  
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
  
  cat > Makefile.am <<'EOF'
  mydir = $(prefix)/my

diff --cc tests/exeext.test
Simple merge

diff --cc tests/exsource.test
Simple merge

diff --cc tests/extra10.test
index 53a08300eae9047eaa73ef54db84ce1b3c4c7d45,8fe7133d201be8a421f879349ee283ecc6ea7520..27eb1ed7c6ec4a72ee38b6a88d1c3e70d678ff92
--- 1/tests/extra10.test
--- 2/tests/extra10.test
+++ b/tests/extra10.test
@@@ -19,9 -19,10 +19,9 @@@
  # See also sister test 'extra11.test', that check a similar usage
  # with the involvement of the $(wildcard) GNU make builtin.
  
 -required=GNUmake
  . ./defs || Exit 1
  
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
  
  cat > Makefile.am <<'END'
  EXTRA_DIST = *.foo

diff --cc tests/extra11.test
index baeac86caf37ff10c099626f64922b8000db1b99,a645afbe4857f7057be8cf486354022c649c0861..b86be730456ac48d2b20b6fa870f01c0e0573ab9
--- 1/tests/extra11.test
--- 2/tests/extra11.test
+++ b/tests/extra11.test
@@@ -17,9 -17,10 +17,9 @@@
  # Check for more complex usage of wildcards in EXTRA_DIST.
  # Suggested by observations from Braden McDaniel.
  
 -required=GNUmake
  . ./defs || Exit 1
  
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
  
  cat > Makefile.am <<'END'
  AUTOMAKE_OPTIONS = -Wno-portability

diff --cc tests/extra12.test
index bdefab489dfe9f6ec3e5417783cf023f76e0648d,97941159236e4bc8366fa364413a26f1d2ffd555..d499cedb2890b2e126343cbb8e65ea6a3d6702cd
--- 1/tests/extra12.test
--- 2/tests/extra12.test
+++ b/tests/extra12.test
@@@ -18,9 -18,10 +18,9 @@@
  # $srcdir != $builddir, if properly declared.
  # Suggested by observations from Braden McDaniel.
  
 -required=GNUmake
  . ./defs || Exit 1
  
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
  
  
  cat > Makefile.am <<'END'

diff --cc tests/fort2.test
Simple merge

diff --cc tests/gnits2.test
Simple merge

diff --cc tests/gnits3.test
Simple merge

diff --cc tests/gnumake.test
index 8ad386bf69a3f5d4929ee20c73c7d2871b90d357,b1ea0002fe7ff95f8d5413cf7ce51404976e204b..dd2fe378fda193f394125ff9b8f6ee2f98b4be3d
--- 1/tests/gnumake.test
--- 2/tests/gnumake.test
+++ b/tests/gnumake.test
@@@ -17,9 -17,10 +17,9 @@@
  # Automake should not assume that make files are called Makefile.
  # Report from Braden McDaniel.
  
 -required=GNUmake
  . ./defs || Exit 1
  
- cat >> configure.in << 'END'
+ cat >> configure.ac << 'END'
  AC_CONFIG_FILES([sub/GNUmakefile])
  AC_OUTPUT
  END

diff --cc tests/instdir-java.test
Simple merge

diff --cc tests/instdir-lisp.test
Simple merge

diff --cc tests/instdir-ltlib.test
Simple merge

diff --cc tests/instdir-prog.test
Simple merge

diff --cc tests/instdir-python.test
Simple merge

diff --cc tests/instdir-texi.test
Simple merge

diff --cc tests/instdir.test
Simple merge

diff --cc tests/instdir2.test
Simple merge

diff --cc tests/insthook.test
Simple merge

diff --cc tests/instmany-mans.test
Simple merge

diff --cc tests/instmany-python.test
Simple merge

diff --cc tests/instmany.test
Simple merge

diff --cc tests/instspc.tap
Simple merge

diff --cc tests/java-compile-run-flat.test
Simple merge

diff --cc tests/java-compile-run-nested.test
Simple merge

diff --cc tests/javaflags.test
index db3c787f5147fb16d6194761cbc65729199e2e32,000ce463f2ded6ba852c8ff8ff9c0b030a277582..f42e3c27fa30d99ae30e9e9a3eb12c1105580dcc
--- 1/tests/javaflags.test
--- 2/tests/javaflags.test
+++ b/tests/javaflags.test
@@@ -24,7 -24,11 +24,7 @@@ echo "$*" > javaflags.lis
  END
  chmod a+x fake-javac
  
- cat >> configure.in <<'END'
 -# Remove JAVAC from the environment, so that it won't interfere
 -# with `make -e' below.
 -unset JAVAC || :
 -
+ 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 --cc tests/lex-lib-external.test
Simple merge

diff --cc tests/lex-libobj.test
Simple merge

diff --cc tests/lex-noyywrap.test
Simple merge

diff --cc tests/lex3.test
Simple merge

diff --cc tests/lex5.test
Simple merge

diff --cc tests/lflags.test
index b8b83ca65645ddcc72127466c1c683a23c699ff5,a29e147b9f47d5df97208ae2c7beb0a95d770f93..98e03fc14c6c1f0a22222d9ee33c713d73743aab
--- 1/tests/lflags.test
--- 2/tests/lflags.test
+++ b/tests/lflags.test
@@@ -29,7 -29,11 +29,7 @@@ echo 'extern int dummy;' >> lex.yy.
  END
  chmod a+x fake-lex
  
- cat >> configure.in <<'END'
 -# Remove Lex from the environment, so that it won't interfere
 -# with `make -e' below.
 -unset LEX || :
 -
+ 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 --cc tests/lflags2.test
index cdf9683f84a9277e052f12a2f88d77704d023d4c,a5afd21a4038ce4ebf90ed5883e2e79fb8069ecf..c5b65adbb09323940a5eaab4a7a48ecb4200c318
--- 1/tests/lflags2.test
--- 2/tests/lflags2.test
+++ b/tests/lflags2.test
@@@ -28,7 -28,11 +28,7 @@@ echo 'extern int dummy;' >> lex.yy.
  END
  chmod a+x fake-lex
  
- cat >> configure.in <<'END'
 -# Remove Lex from the environment, so that it won't interfere
 -# with `make -e' below.
 -unset LEX || :
 -
+ 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 --cc tests/libobj19.test
Simple merge

diff --cc tests/libtool9.test
Simple merge

diff --cc tests/lisp8.test
Simple merge

diff --cc tests/list-of-tests.mk
Simple merge

diff --cc tests/make-dryrun.tap
index a581bc430eac8a201c77ec6e4dbbd7e0fddd5b9e,37692059b63fea64b881351c59be7d3006405add..57c7a1c6c9dda417ee613b459f096100af6f01fb
--- 1/tests/make-dryrun.tap
--- 2/tests/make-dryrun.tap
+++ b/tests/make-dryrun.tap
@@@ -21,9 -21,15 +21,9 @@@ am_parallel_tests=yes # Avoid generatio
  
  plan_ 14
  
 -if echo "all: ; @+printf %sbb%s aa cc" | $MAKE -n -f - | grep aabbcc; then
 -  make_plus_silence () { return 0; }
 -else
 -  make_plus_silence () { return 1; }
 -fi
 -
  mkdir sub
  
- echo AC_OUTPUT >> configure.in
+ echo AC_OUTPUT >> configure.ac
  
  cat > Makefile.am <<'END'
  all:

diff --cc tests/makej.test
index 6c821115214ca61dcd713af803d064ffac8d842d,9144d83e25af457abb3c4a2ef6efd683984be0e7..a28253575c6b65affec6c49fb742f8a72dd8fda7
--- 1/tests/makej.test
--- 2/tests/makej.test
+++ b/tests/makej.test
@@@ -21,9 -21,10 +21,9 @@@
  # depend on the time at which autoconf and automake update the cache
  # via autom4te.
  
 -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 --cc tests/maken.test
Simple merge

diff --cc tests/maken3.test
index c4474b01c10d8fe9c326ba3b0017148b5a11f78f,837b15b9bbed95efcce8638c74447b332fe5c982..7228a83e951bcddfd7b62dc776c7ac1cc05c6288
--- 1/tests/maken3.test
--- 2/tests/maken3.test
+++ b/tests/maken3.test
@@@ -23,9 -26,24 +23,9 @@@
  
  . ./defs || Exit 1
  
 -# Does $MAKE support the '.MAKE' special target?
 -have_dotmake=false
 -if using_gmake; then
 -  have_dotmake=: # GNU make must support it.
 -else
 -  unindent > mk.tmp << 'END'
 -    targ.tmp:
 -      : > $@
 -    .MAKE: targ.tmp
 -END
 -  if $MAKE -n -f mk.tmp targ.tmp && test -f targ.tmp; then
 -    have_dotmake=:
 -  fi
 -fi
 -
  mkdir sub sub2
  
- cat >> configure.in << 'END'
+ cat >> configure.ac << 'END'
  AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
  AC_OUTPUT
  END

diff --cc tests/man3.test
Simple merge

diff --cc tests/man6.test
Simple merge

diff --cc tests/man8.test
Simple merge

diff --cc tests/mmodely.test
Simple merge

diff --cc tests/multlib.test
Simple merge

diff --cc tests/output6.test
Simple merge

diff --cc tests/parallel-tests-cmdline-override.test
Simple merge

diff --cc tests/parallel-tests-empty-testlogs.test
Simple merge

diff --cc tests/parallel-tests-exit-statuses.test
Simple merge

diff --cc tests/parallel-tests-extra-programs.test
Simple merge

diff --cc tests/parallel-tests-fork-bomb.test
index 1f86c75c8edb97cd90f888619f5e2af4e740c9fd,d992d63a1660144abefd6b91598411997c039037..2032d7bf986db7d2ad79b84103240b5b5e918023
--- 1/tests/parallel-tests-fork-bomb.test
--- 2/tests/parallel-tests-fork-bomb.test
+++ b/tests/parallel-tests-fork-bomb.test
@@@ -31,18 -31,56 +31,18 @@@ TESTS 
  
  errmsg = ::OOPS:: Recursion too deep
  
 -if IS_GNU_MAKE
 +is_too_deep := $(shell test $(MAKELEVEL) -lt 10 && echo no)
  
 - is_too_deep := $(shell test $(MAKELEVEL) -lt 10 && echo no)
 -
 -## Indenteation here required to avoid confusing Automake.
 +## Extra indentation here required to avoid confusing Automake.
 +## FIXME: now that we assume make is GNU make, this shouldn't happen!
   ifeq ($(is_too_deep),no)
 +   # All is ok.
   else
 - $(error $(errmsg), $(MAKELEVEL) levels)
 +   $(error $(errmsg), $(MAKELEVEL) levels)
   endif
 -
 -else !IS_GNU_MAKE
 -
 -# We use mkdir to detect the level of recursion, since it is easy
 -# to use and assured to be portably atomical.  Also use an higher
 -# number than with GNU make above, since the level used here can
 -# be incremented by tow or more per recursion.
 -recursion-not-too-deep:
 -      @ok=no; \
 -      for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 \
 -               18 19 20 21 22 23 24 25 26 27 28 29; \
 -      do \
 -        echo " mkdir rec-$$i.d"; \
 -        if mkdir rec-$$i.d; then \
 -          ok=yes; break; \
 -        else :; fi; \
 -      done; \
 -      test $$ok = yes || { echo '$(errmsg)' >&2; exit 1; }
 -.PHONY: recursion-not-too-deep
 -clean-local:
 -      rmdir rec-[0-9].d
 -
 -targets = all check recheck $(TESTS) $(TEST_LOGS) $(TEST_SUITE_LOG)
 -$(targets): recursion-not-too-deep
 -
 -# For BSD make.
 -.BEGIN: recursion-not-too-deep
 -
 -endif !IS_GNU_MAKE
  END
  
- echo AC_OUTPUT >> configure.in
 -if using_gmake; then
 -  cond=:
 -else
 -  cond=false
 -fi
 -
 -cat >> configure.ac << END
 -AM_CONDITIONAL([IS_GNU_MAKE], [$cond])
 -AC_OUTPUT
 -END
++echo AC_OUTPUT >> configure.ac
  
  # Another helpful idiom to avoid hanging on capable systems.  The subshell
  # is needed since `ulimit' might be a special shell builtin.

diff --cc tests/parallel-tests-harderror.test
Simple merge

diff --cc tests/parallel-tests-log-compiler-1.test
Simple merge

diff --cc tests/parallel-tests-log-override-1.test
Simple merge

diff --cc tests/parallel-tests-log-override-2.test
Simple merge

diff --cc tests/parallel-tests-log-override-recheck.test
Simple merge

diff --cc tests/parallel-tests-no-color-in-log.test
Simple merge

diff --cc tests/parallel-tests.test
Simple merge

diff --cc tests/parallel-tests2.test
Simple merge

diff --cc tests/parallel-tests3.test
index ffa900ec58b536f7e0a912b3654c6b5790355871,b550b7b6b9d7f622721d8e6b64e289954c5b8aae..9ba27f286872f839034795b86c8e42f30aa9ac1b
--- 1/tests/parallel-tests3.test
--- 2/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@@ -24,7 -24,28 +24,7 @@@ case $MAKE i
    *\ -j*) skip_ "\$MAKE contains \`-j'";;
  esac
  
- cat >> configure.in << 'END'
 -if using_gmake; then
 -  j=-j
 -else
 -  unindent > Makefile <<END
 -    all: one two
 -    one:
 -      $sleep && test -f two
 -    two:
 -      echo ok > \$@
 -END
 -  for j in "-j" "-j " NONE; do
 -    if test x"$j" = xNONE; then
 -      skip_ "can't run make in parallel mode"
 -    fi
 -    $MAKE ${j}2 all >output 2>&1 || continue
 -    $EGREP -i "(warning|error):|-j[\"\'\` ]" output && continue
 -    break
 -  done
 -  rm -f one output Makefile
 -fi
 -
+ cat >> configure.ac << 'END'
  AC_OUTPUT
  END
  

diff --cc tests/parallel-tests5.test
index 9500f4dcf6f4f91deed50ef6dd372318443e6cee,9f0a9669e36db3d0553a60419dc530e89b347052..62256e0a5f77121bf7dd4c67a2b614fb0f57373d
--- 1/tests/parallel-tests5.test
--- 2/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@@ -21,10 -21,10 +21,10 @@@
  # It merely serves as demonstration.  :-)
  
  am_parallel_tests=yes
 -required='cc native GNUmake'
 +required='cc native'
  . ./defs || Exit 1
  
- cat >> configure.in << 'END'
+ cat >> configure.ac << 'END'
  AC_PROG_CC
  AC_OUTPUT
  END

diff --cc tests/parallel-tests8.test
Simple merge

diff --cc tests/pr8365-remake-timing.test
Simple merge

diff --cc tests/python-virtualenv.test
Simple merge

diff --cc tests/remake-all-1.test
Simple merge

diff --cc tests/remake-deleted-m4-file.test
index bcd17faca0e2f5dfcc9c412944886ae397c74386,177979e9e297bd8c7a3ef092cb6755e3ca78d2b6..258dde24bd0b4091fdeace6872ed921f6f792e9d
--- 1/tests/remake-deleted-m4-file.test
--- 2/tests/remake-deleted-m4-file.test
+++ b/tests/remake-deleted-m4-file.test
@@@ -63,10 -64,11 +63,10 @@@ $MAKE tes
  
  $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
  $MAKE test
  
  :

diff --cc tests/remake-gnulib-add-acsubst.test
Simple merge

diff --cc tests/remake-gnulib-add-header.test
Simple merge

diff --cc tests/remake-gnulib-remove-header.test
Simple merge

diff --cc tests/remake-moved-m4-file.test
Simple merge

diff --cc tests/remake-renamed-am.test
Simple merge

diff --cc tests/remake-renamed-m4-file.test
Simple merge

diff --cc tests/remake-renamed-m4-macro-and-file.test
index 2d93fc8ca475dc7771b7d33c749114a3544b6c74,77e9d3eb55a0ba2b26cd725ed4161f3ed3deec99..6e99cdfee007c757b138cd15f431b9fa1db6c4d4
--- 1/tests/remake-renamed-m4-macro-and-file.test
--- 2/tests/remake-renamed-m4-macro-and-file.test
+++ b/tests/remake-renamed-m4-macro-and-file.test
@@@ -71,8 -72,9 +71,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
  ls -l $distdir $distdir/*

diff --cc tests/remake-renamed-m4-macro.test
Simple merge

diff --cc tests/remake-subdir-from-subdir.test
Simple merge

diff --cc tests/remake-subdir-gnu.test
Simple merge

diff --cc tests/remake-subdir-long-time.test
index 0d04b00a062f47333fff101126797cb07f148327,8f3174025d6de73e2381ff4e14892035d1134a54..89dccaf291b137c9d6534e3defa79fc023385c1f
--- 1/tests/remake-subdir-long-time.test
--- 2/tests/remake-subdir-long-time.test
+++ b/tests/remake-subdir-long-time.test
@@@ -93,14 -93,14 +93,14 @@@ rm -f automake-has-run aclocal-has-ru
  
  ./configure
  # Sanity check: Makefile doesn't get updated uselessly.
 -ACLOCAL=false AUTOMAKE=false AUTOCONF=false $MAKE -e
 +$MAKE ACLOCAL=false AUTOMAKE=false AUTOCONF=false
  
  $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
 +$MAKE Makefile AUTOMAKE="$AUTOMAKE" ACLOCAL="$ACLOCAL"
  cd ..
  
  # For debugging.

diff --cc tests/remake-subdir.test
index 44e61093c6fb222e9c792c98005cd5da85e830bb,3b3a8c1b08dc2ba324ce390575be46e6a76e8236..f8290f63f1a1136bf8782bb6351ae898fa5c8456
--- 1/tests/remake-subdir.test
--- 2/tests/remake-subdir.test
+++ b/tests/remake-subdir.test
@@@ -51,10 -57,10 +51,10 @@@ $MAK
  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
 +$MAKE
  cd ..
  debug_info
  $FGREP $magic1 configure

diff --cc tests/remake10a.test
index 3bff12d72fd6f50bee183406f74a75ca7ec3737e,9cb835cf74e34a087a91017e0f560afdd7907c02..c7ac87a08661d22f0885484208d803cdf5393568
--- 1/tests/remake10a.test
--- 2/tests/remake10a.test
+++ b/tests/remake10a.test
@@@ -24,9 -24,13 +24,9 @@@ magic1=::MagicStringOne:
  magic2=__MagicStringTwo__
  magic3=%%MagicStringThree%%
  
 -if using_gmake; then
 -  remake="$MAKE nil"
 -else
 -  remake="$MAKE Makefile"
 -fi
 +remake="$MAKE nil"
  
- cat >> configure.in <<END
+ cat >> configure.ac <<END
  m4_include([foo.m4])
  AC_SUBST([FINGERPRINT], [my_fingerprint])
  AC_OUTPUT

diff --cc tests/remake10b.test
index 94d1cd016b91700cf4c5adcad910128d4c75a22f,2fce52c07f9c14c1c1b8a9f19dc76aafe99b74c9..37eb635a4ad69e4247ff1ce15f7a79d486494066
--- 1/tests/remake10b.test
--- 2/tests/remake10b.test
+++ b/tests/remake10b.test
@@@ -24,9 -24,13 +24,9 @@@ magic1=::MagicStringOne:
  magic2=__MagicStringTwo__
  magic3=%%MagicStringThree%%
  
 -if using_gmake; then
 -  remake="$MAKE nil"
 -else
 -  remake="$MAKE Makefile"
 -fi
 +remake="$MAKE nil"
  
- cat >> configure.in <<'END'
+ cat >> configure.ac <<'END'
  AC_OUTPUT
  END
  

diff --cc tests/remake10c.test
index b9df6c5ee6bd6992852dbce09babd24036515107,51537c129ee16d0bf87deb3f037950b3e7e96f21..2eb88dbe6b8235bb7fc560ac7cba3c4b10123ca0
--- 1/tests/remake10c.test
--- 2/tests/remake10c.test
+++ b/tests/remake10c.test
@@@ -24,9 -24,13 +24,9 @@@ magic1=::MagicStringOne:
  magic2=__MagicStringTwo__
  magic3=%%MagicStringThree%%
  
 -if using_gmake; then
 -  remake="$MAKE nil"
 -else
 -  remake="$MAKE Makefile"
 -fi
 +remake="$MAKE nil"
  
- cat >> configure.in <<END
+ cat >> configure.ac <<END
  FINGERPRINT='my_fingerprint'
  AC_SUBST([FINGERPRINT])
  AC_OUTPUT

diff --cc tests/remake12.test
index 4453fbf780a3e47f68ebfc01b577ed5df7a102a7,103e00962b8ac7c6c019f3282b867e5a79655597..1154d96e95838ab62441f562bcd02d6d1fbf4d83
--- 1/tests/remake12.test
--- 2/tests/remake12.test
+++ b/tests/remake12.test
@@@ -23,7 -23,22 +23,7 @@@ magic1=::MagicStringOne:
  magic2=__MagicStringTwo__
  magic3=%%MagicStringThree%%
  
- cat > configure.in <<END
 -# See if the user's make implementation support an include directive.
 -# We need it in this test.
 -echo 'all:; @echo include is supported' > incl.mk
 -echo 'include incl.mk' > gnu-style.mk
 -echo '.include "incl.mk"' > bsd-style.mk
 -if $MAKE -f gnu-style.mk | grep 'include is supported'; then
 -  echo "$me: GNU make include style supported"
 -  include_zardoz='include zardoz'
 -elif $MAKE -f bsd-style.mk | grep 'include is supported'; then
 -  echo "$me: BSD make include style supported"
 -  include_zardoz='.include "zardoz"'
 -else
 -  skip_ "make doesn't support any \"include\" directive"
 -fi
 -
+ cat > configure.ac <<END
  AC_INIT([$me], [1.0])
  AM_INIT_AUTOMAKE
  AC_CONFIG_FILES([zardoz])

diff --cc tests/remake5.test
index 3c4154744d99fd0060aa7c3928c99939ea5f93d7,dba802a894036ed0f112103a3efc05ae5ddd5ae5..be98afd16e79fb50c72bb35c361df30cd5fc6932
--- 1/tests/remake5.test
--- 2/tests/remake5.test
+++ b/tests/remake5.test
@@@ -20,7 -20,13 +20,7 @@@
  
  . ./defs || Exit 1
  
- cat >>configure.in <<'EOF'
 -if using_gmake; then
 -  remake="$MAKE"
 -else
 -  remake="$MAKE Makefile"
 -fi
 -
+ cat >>configure.ac <<'EOF'
  AM_MAINTAINER_MODE
  m4_include([foo.m4])
  if test ! -f rebuild_ok; then
@@@ -44,8 -50,8 +44,8 @@@ $MAK
  # 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
  
  # Make sure the rebuild rule for Makefile is triggered.
  $sleep

diff --cc tests/remake8a.test
Simple merge

diff --cc tests/remake8b.test
Simple merge

diff --cc tests/remake9a.test
index 3b5d58affd067c91b41b658f88ab2eac1513ea67,90a780a401aeca99bd63669a96c3d22bfd0661e2..ff06848dbdfcbe91f2a5fbf5a152b13e658b2434
--- 1/tests/remake9a.test
--- 2/tests/remake9a.test
+++ b/tests/remake9a.test
@@@ -22,7 -22,13 +22,7 @@@
  magic1=::MagicStringOne::
  magic2=__MagicStringTwo__
  
- cat >> configure.in <<END
 -if using_gmake; then
 -  remake_() { $MAKE nil; }
 -else
 -  remake_() { $MAKE Makefile && $MAKE foo.sh; }
 -fi
 -
+ cat >> configure.ac <<END
  FINGERPRINT=BadBadBad
  AC_SUBST([FINGERPRINT])
  AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])
@@@ -70,9 -76,9 +70,9 @@@ for vpath in : false; d
    $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_
 +  $MAKE nil
    $FGREP FINGERPRINT Makefile # For debugging.
    $FGREP $magic1 Makefile
    test x"`./foo.sh`" = x"$magic1"
@@@ -88,8 -94,9 +88,8 @@@
  
    $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.
    $FGREP $magic2 Makefile && Exit 1 # Likewise.

diff --cc tests/remake9b.test
Simple merge

diff --cc tests/remake9c.test
index 48117c5c8fe8d777650e88a2222e67b325fde178,77a327fac9743bb971098474cd2ea52eff4f376a..19afa61835d1abfb65a0c4772fc64eee63f52469
--- 1/tests/remake9c.test
--- 2/tests/remake9c.test
+++ b/tests/remake9c.test
@@@ -22,7 -22,13 +22,7 @@@
  magic1=::MagicStringOne::
  magic2=__MagicStringTwo__
  
- cat >> configure.in <<END
 -if using_gmake; then
 -  remake_() { $MAKE nil; }
 -else
 -  remake_() { $MAKE Makefile && $MAKE foo.sh; }
 -fi
 -
+ cat >> configure.ac <<END
  FINGERPRINT='my_fingerprint'
  AC_SUBST([FINGERPRINT])
  AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])

diff --cc tests/remake9d.test
index 5c52f3308b353cdca8fffc31739b85eee2990a5f,4ebd3e7619b43059a83b7a480c8e57f609a5a631..e2daa31c4b98448a7ce4ecb07525308ea88be6fb
--- 1/tests/remake9d.test
--- 2/tests/remake9d.test
+++ b/tests/remake9d.test
@@@ -22,7 -22,13 +22,7 @@@
  magic1=::MagicStringOne::
  magic2=__MagicStringTwo__
  
- cat >> configure.in <<END
 -if using_gmake; then
 -  remake_() { $MAKE nil; }
 -else
 -  remake_() { $MAKE Makefile && $MAKE foo.sh; }
 -fi
 -
+ cat >> configure.ac <<END
  FINGERPRINT='my_fingerprint'
  AC_SUBST([FINGERPRINT])
  AC_CONFIG_FILES([foo.sh:foo.in], [chmod a+x foo.sh])

diff --cc tests/silent6.test
Simple merge

diff --cc tests/subobj11a.test
Simple merge

diff --cc tests/subobj11c.test
Simple merge

diff --cc tests/subobj4.test
Simple merge

diff --cc tests/subpkg-yacc.test
Simple merge

diff --cc tests/subst-no-trailing-empty-line.test
Simple merge

diff --cc tests/suffix-chain.tap
Simple merge

diff --cc tests/suffix10.tap
Simple merge

diff --cc tests/suffix11.tap
Simple merge

diff --cc tests/suffix12.test
Simple merge

diff --cc tests/suffix13.test
Simple merge

diff --cc tests/suffix3.tap
Simple merge

diff --cc tests/suffix5.test
Simple merge

diff --cc tests/suffix6b.test
index ffd9ba034e7a37373401de84903de8f124f9a352,319e02179179d629f9260349e927c571183826fa..67ef877b10bd7db02c227ed94d07396949fd024a
--- 1/tests/suffix6b.test
--- 2/tests/suffix6b.test
+++ b/tests/suffix6b.test
@@@ -17,9 -17,10 +17,9 @@@
  # Test to make sure Automake supports implicit rules with dot-less
  # extensions.  Se also related "grepping" test suffix6.test.
  
 -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 --cc tests/suffix6c.test
Simple merge

diff --cc tests/suffix8.tap
Simple merge

diff --cc tests/tap-basic.test
Simple merge

diff --cc tests/tap-summary-aux.sh
Simple merge

diff --cc tests/test-driver-custom-multitest-recheck2.test
Simple merge

diff --cc tests/test-driver-custom-multitest.test
Simple merge

diff --cc tests/test-driver-custom-xfail-tests.test
Simple merge

diff --cc tests/test-log.test
Simple merge

diff --cc tests/test-missing.test
Simple merge

diff --cc tests/test-trs-basic.test
Simple merge

diff --cc tests/test-trs-recover.test
Simple merge

diff --cc tests/test-trs-recover2.test
Simple merge

diff --cc tests/testsuite-summary-checks.sh
Simple merge

diff --cc tests/testsuite-summary-reference-log.test
Simple merge

diff --cc tests/txinfo21.test
Simple merge

diff --cc tests/vala-mix.test
index 82d305a6e74901d214d9acbdad0ff4bc5b04c7c0,acf47d989773b3209ba9b9bb07fb1f0c2b0efe2d..2cd21464b61e5fd0af66f022a83aad9a0f9def34
--- 1/tests/vala-mix.test
--- 2/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@@ -16,10 -16,10 +16,10 @@@
  
  # Vala sources and C sources in the same program.  Functional test.
  
 -required='valac cc GNUmake'
 +required='valac cc'
  . ./defs || Exit 1
  
- cat >> configure.in <<'END'
+ cat >> configure.ac <<'END'
  AC_PROG_CC
  AM_PROG_CC_C_O
  AM_PROG_VALAC

diff --cc tests/vala-vpath.test
index c2a3ea8af0fe3e55e8f1aeb0cdec185cc4d338d4,636e66ec6a5cd4a8dff3a76f5febdea10873ed07..cef335daa7059ab306c5e1048bbed54f1772780b
--- 1/tests/vala-vpath.test
--- 2/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@@ -17,10 -17,10 +17,10 @@@
  # Test to make sure vala support handles from-scratch VPATH builds.
  # See automake bug#8753.
  
 -required="valac GNUmake"
 +required=valac
  . ./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 --cc tests/vala2.test
Simple merge

diff --cc tests/vala3.test
Simple merge

diff --cc tests/vala5.test
Simple merge

diff --cc tests/vars-assign.test
index 9b91c26e6e7e97ae4075a9de6a8a2ffbb56fda89,fb4c14003fe6fc2bb3c6506597dfb5df7f461403..120118f838b1446a3d59fc3840119432f02e0c99
--- 1/tests/vars-assign.test
--- 2/tests/depend6.test
+++ b/tests/vars-assign.test
@@@ -19,30 -19,28 +19,30 @@@
  
  . ./defs || Exit 1
  
- echo AC_OUTPUT >> configure.in
 -cat >>configure.ac << END
 -AC_PROG_CC
 -AC_OUTPUT
 -END
++echo AC_OUTPUT >> configure.ac
  
 -cat > Makefile.am << END
 -bin_PROGRAMS = foo
 -foo_SOURCES = foo.c foo.h
 -END
 +unset PREFOO FOO BAR BAZ XFOO XBAZ || :
 +
 +cat > Makefile.am <<'END'
 +PREFOO = bar
 +FOO := foo$(PREFOO)$(XFOO)
 +XFOO = fail
 +BAR ?= barbar
  
 -cat >foo.c << END
 -#include "foo.h"
 +.PHONY: test1 test2
 +test1:
 +      test $(FOO) = foobar
 +      test $(BAR) = barbar
 +test2:
 +      test $(FOO) = foobar
 +      test $(BAR) = rabrab
  END
 -: >foo.h
  
  $ACLOCAL
 -$AUTOMAKE
  $AUTOCONF
 -./configure --disable-dependency-tracking 2>stderr || {
 -  stat=$?; cat stderr >&2; Exit $stat;
 -}
 -cat stderr >&2
 -grep shift stderr && Exit 1
 +$AUTOMAKE
 +./configure
 +$MAKE test1
 +PREFOO=notseen FOO=notseen BAR=rabrab $MAKE test2
  
  :

diff --cc tests/version7.test
Simple merge

diff --cc tests/warning-groups-win-over-strictness.test
Simple merge

diff --cc tests/warnings-override.test
Simple merge

diff --cc tests/warnings-precedence.test
Simple merge

diff --cc tests/warnings-strictness-interactions.test
Simple merge

diff --cc tests/warnings-win-over-strictness.test
Simple merge

diff --cc tests/yacc-basic.test
Simple merge

diff --cc tests/yacc-bison-skeleton-cxx.test
Simple merge

diff --cc tests/yacc-bison-skeleton.test
Simple merge

diff --cc tests/yacc-cxx.test
Simple merge

diff --cc tests/yacc-d-basic.test
Simple merge

diff --cc tests/yacc-d-cxx.test
Simple merge

diff --cc tests/yacc-dist-nobuild-subdir.test
index fb4f1d7cfcbabf27431562c4a76f6d497ffff031,67568d79731878533754ac3b542e2b220eef65b5..05f76a9b975284187c85d3dbafe2b72c491bd331
--- 1/tests/yacc-dist-nobuild-subdir.test
--- 2/tests/yacc-dist-nobuild-subdir.test
+++ b/tests/yacc-dist-nobuild-subdir.test
@@@ -21,7 -21,11 +21,7 @@@
  required=yacc
  . ./defs || Exit 1
  
- cat >> configure.in << 'END'
 -# This test is bounded to fail for any implementation that
 -# triggers automake bug#7884.
 -useless_vpath_rebuild && skip_ "would trip on automake bug#7884"
 -
+ cat >> configure.ac << 'END'
  AC_PROG_CC
  AM_PROG_CC_C_O
  AC_PROG_YACC

diff --cc tests/yacc-nodist.test
Simple merge

diff --cc tests/yflags-cmdline-override.test
Simple merge

diff --cc tests/yflags.test
index 4bed0c987097ef7846f110def5bb0153be47d8f1,5101eedc9e7747ce0f3ed81b7c5daaa256a38856..969ded0b95f06930b08a77baa760567d4dec1260
--- 1/tests/yflags.test
--- 2/tests/yflags.test
+++ b/tests/yflags.test
@@@ -28,7 -28,11 +28,7 @@@ echo 'extern int dummy;' >> y.tab.
  END
  chmod a+x fake-yacc
  
- cat >> configure.in <<'END'
 -# Remove Yacc from the environment, so that it won't interfere
 -# with `make -e' below.
 -unset YACC || :
 -
+ 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 --cc tests/yflags2.test
index 0f76b4ccdd97256e5fb1002b47f9aa7690751e1a,d9cf5ed15664bbca139546d12f63e81403ba7eb7..092b5b8c253f3a6cf651cf1cd21d8158e8be0a21
--- 1/tests/yflags2.test
--- 2/tests/yflags2.test
+++ b/tests/yflags2.test
@@@ -28,7 -28,11 +28,7 @@@ echo 'extern int dummy;' >> y.tab.
  END
  chmod a+x fake-yacc
  
- cat >> configure.in <<'END'
 -# Remove Yacc from the environment, so that it won't interfere
 -# with `make -e' below.
 -unset YACC || :
 -
+ 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])