Remove trailing whitespace
Use dedicated m4 dir, update deprecated macros.
Merge pull request #766 from justinclift/update_configure

Update bootstrap configure pieces