Merged autotools cleanups from Jason Taylor