[Bug 37117] configure fails in git/master