Require m4 1.4.6, and fix testsuite to support this version.