Use dedicated m4 dir, update deprecated macros.