Remove, add and update m4 files as applicable.