Update m4 macros and automake options.

Monotone-Parent: 3b8f629ced99006415691a247d4552f86f25575c
Monotone-Revision: 7440602de4dce9cab3f5be35cd7554a4aacdf841