Simplify boost library build configuration.
Fix merge conflicts.