Repair m4 and autoconf.