Use AC_ARG_VAR for X11 header and XKB paths And don't call pkg-config unless we need to. Signed-off-by: Daniel Stone <daniel@fooishbar.org>