Merge branch 'maint'

* maint:
  fixup: delete "# serial" line in m4/amversion.in
  news: update about recent ylwrap changes and fixes
  m4: get rid of "# serial" lines
  configure: ${#param} must be supported by the shell for the testsuite
  yacc tests: fix a spurious failure with parallel make
  ylwrap: use proper quoting inside a `...` substitution
  ylwrap: don't uselessly reset the exit status in case of failure
  ylwrap: fix C++ support for Bison
  ylwrap: refactor: move loop invariant
  ylwrap: refactoring: don't rely on the file order
  tests: upgrade and fix Bison test case
  tests: fix bison input file
  ylwrap: comment changes
  ylwrap: modernize idioms
  ylwrap: rename header inclusion in generated parsers
  ylwrap: simplify the list of renamings
  ylwrap: refactor: less duplication

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc NEWS
index d2fc46d,f468570..6c39a7d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -143,8 -76,18 +149,20 @@@ New in 1.12.3
  
    - Some testsuite weaknesses and spurious failures have been fixed.
  
+ * Long-standing bugs:
+ 
+   - Instead of renaming only self-references of files (typically for
+     #lines), ylwrap now also renames references to the other generated
+     files.  This fixes support for GLR and C++ parsers from Bison (PR
+     automake/491 and automake bug#7648): 'parser.c' now properly
+     #includes 'parser.h' instead of 'y.tab.h'.
+ 
+   - Generated files unknown to ylwrap are now preserved.  This fixes
+     C++ support for Bison (automake bug#7648): location.hh and the
+     like are no longer discarded.
+ 
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
  New in 1.12.2:
  
  * Warnings and deprecations:

diff --cc configure.ac
Simple merge

diff --cc m4/amversion.m4
Simple merge

diff --cc m4/depout.m4
Simple merge

diff --cc m4/dmalloc.m4
Simple merge

diff --cc m4/init.m4
Simple merge

diff --cc m4/lispdir.m4
Simple merge

diff --cc m4/maintainer.m4
Simple merge

diff --cc m4/missing.m4
index 2de7fe4,6c2a55d..a246a9c
--- 1/m4/missing.m4
--- 2/m4/missing.m4
+++ b/m4/missing.m4
@@@ -15,11 -13,10 +13,10 @@@ AC_DEFUN([AM_MISSING_PROG]
  $1=${$1-"${am_missing_run}$2"}
  AC_SUBST($1)])
  
- 
  # AM_MISSING_HAS_RUN
  # ------------------
 -# Define MISSING if not defined so far and test if it supports --run.
 -# If it does, set am_missing_run to use it, otherwise, to nothing.
 +# Define MISSING if not defined so far and test if it is modern enough.
 +# If it is, set am_missing_run to use it, otherwise, to nothing.
  AC_DEFUN([AM_MISSING_HAS_RUN],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
  AC_REQUIRE_AUX_FILE([missing])dnl

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