Compile fix for --without-x.

5 files changed