Clean up the autotools scripts a bit