Add X11 option

It allows to control explicitly X11 use.