Fix Windows build
Fix --without-ogr (not sure if we want to keep that option)