Merge "fix msvc configure"