Autotools cleanup

Hi, here's a few changes which should get rid of a couple warnings on newer autotools installs.