howto: update m4 files to match latest master