Disable X11 with --disable-x11.

Revise the code to latest version. And thank you for all the suggestions! 
Signed-off-by: Tang Xin <xin.t.tang@intel.com>