Merge branch 'maint'

* maint:
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index fd50754,b545dda..dd1875e
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -831,17 -677,9 +831,18 @@@ remake-subdir-from-subdir.test 
  remake-subdir-gnu.test \
  remake-subdir.test \
  remake-subdir2.test \
+ remake-subdir-long-time.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \

diff --cc tests/Makefile.in
index 306189d,fe44a40..08ac8e8
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1104,17 -954,9 +1104,18 @@@ remake-subdir-from-subdir.test 
  remake-subdir-gnu.test \
  remake-subdir.test \
  remake-subdir2.test \
+ remake-subdir-long-time.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \