m4: prepend m4 builtins with "m4_"

The comments in 'lib/autoconf/autoconf.m4' from Autoconf 2.69 read:

  We discourage the use of the non prefixed macro names: M4sugar maps
  all the builtins into 'm4_'.  Autoconf has been converted to these
  names too.  But users may still depend upon these, so reestablish
  them.

Alas, in our init.m4 files, we were still using m4 builtins without
prefixing them with "m4_".  Not nice for a package that is one of the
major clients of Autoconf, and an integral part of the GNU Autotools!

Fix the issue.

* m4/init.m4 (AM_INIT_AUTOMAKE): Use 'm4_define' and 'm4_defn' instead
of 'define' and 'defn'.

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

diff --git a/m4/init.m4 b/m4/init.m4
index 0cf8720..206034c 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -90,23 +90,23 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 _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],
                  [_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
 ])
 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
 dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the