Add m4 macros that we will need