Hotfix boost win2 for master

Same as #115, except that conflicts have already been resolved.

Tested and working on Linux and Windows, not tested on MacOS. It should work though, because the with-* options seem to be semantically equivalent, whether given to the CONFIGURE or BUILD command.