Autotools updates

Just a few autotools updates/fixes.