Use local mirror of m4 macros tree
Update m4 macros to latest version.
Update to latest set of m4 macros.