Update m4 macros to latest version.