configure: More msvc/icl combining

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>