Play catch up with recent configure.in changes: