Baby steps at this point given the complexity of the remaining upgrades.  Bumped m4 to match SWE3.1-gamal's version.
Babby steps.  Bumped gmp.