--- configure.ac.orig	2021-06-03 10:22:08 UTC
+++ configure.ac
@@ -96,7 +96,11 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40,
 
 
 # Check for X11 installed
-XDT_CHECK_LIBX11_REQUIRE()
+XDT_CHECK_LIBX11()
+if test "x$with_x" = "xyes" ; then
+        XDT_CHECK_LIBX11_REQUIRE()
+fi
+AM_CONDITIONAL([USE_LIBX11], [test "x$with_x" = xyes])
 
 # Check for Polkit/PolicyKit
 XDT_CHECK_OPTIONAL_PACKAGE([POLKIT], [polkit-gobject-1], [polkit_minimum_version],
@@ -439,11 +443,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 
 # check for gtk-doc
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-],[
 AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-])
 
 dnl ---------------------------------------------------------------------------
 dnl check for inotify
@@ -553,7 +553,6 @@ doc/dbus/Makefile
 doc/console-kit-daemon.1m
 doc/dbus/ConsoleKit.xml
 doc/dbus/Makefile
-doc/libconsolekit/Makefile
 libconsolekit/Makefile
 libconsolekit/libconsolekit.pc
 libck-connector/Makefile