Use local version of m4 macros.
Update m4 macros to latest version.