Fix -xorg -> -xserver renaming: alter build system accordingly.