Update m4 to 1.4.17.  Update make to 4.0.