* ./bootstrap: fixed a conflict issue with recent autopoint versions.