Misc fixes.

- Update to latest version.
- Pick up m4 from the distribution.