Fix configure for buildbots, fix rebase fallout.

@cmr, hope that fixes it...