Draft: Build improvements

2 small fix commits, and adding an option to compile libvlc using vlc4 while keeping the vlc3 build