Some updates for automake 1.7 and prep for releasing 3.80.