Merge branch 'maint'

* maint:
  m4: prepend m4 builtins with "m4_"
  docs: fix clumsy grammar in the scripts-based testsuite chapter

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

diff --cc doc/automake.texi
Simple merge

diff --cc m4/init.m4
index 91a0620d91b9181b4be6e476dd2c4749b019da48,206034c549da709a438dab15f1d09eaa28288e1d..a496154d008b723e337988ddfb16740985db48b2
--- 1/m4/init.m4
--- 2/m4/init.m4
+++ b/m4/init.m4
@@@ -90,22 -90,25 +90,22 @@@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TA
  _AM_IF_OPTION([no-dependencies],,
  [AC_PROVIDE_IFELSE([AC_PROG_CC],
                  [_AM_DEPENDENCIES([CC])],
-                 [define([AC_PROG_CC],
-                         defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+                 [m4_define([AC_PROG_CC],
+                            m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
  AC_PROVIDE_IFELSE([AC_PROG_CXX],
                  [_AM_DEPENDENCIES([CXX])],
-                 [define([AC_PROG_CXX],
-                         defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+                 [m4_define([AC_PROG_CXX],
+                            m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
  AC_PROVIDE_IFELSE([AC_PROG_OBJC],
                  [_AM_DEPENDENCIES([OBJC])],
-                 [define([AC_PROG_OBJC],
-                         defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+                 [m4_define([AC_PROG_OBJC],
+                            m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
 -dnl Support for Objective C++ was only introduced in Autoconf 2.65,
 -dnl but we still cater to Autoconf 2.62.
 -m4_ifdef([AC_PROG_OBJCXX],
 -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
                  [_AM_DEPENDENCIES([OBJCXX])],
-                 [define([AC_PROG_OBJCXX],
-                         defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+                 [m4_define([AC_PROG_OBJCXX],
 -                           m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
++                           m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
  ])
 -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
 +AC_REQUIRE([AM_SILENT_RULES])dnl
  dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
  dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
  dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.