Note that configure hadn't been checked in a few times so it has more
changes, catching up with the last few changes to congifure.in as
well.