Add the missing m4 macros
Fix build errors