(submit/drop-hal) xfree86: consolidate dbus and systemd-logind probing

dbus is only needed for systemd-logind support, so no need for
having separate symbols.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

config/dbus-core.h

@@ -26,7 +26,7 @@
 #ifndef DBUS_CORE_H
 #define DBUS_CORE_H
 
-#ifdef NEED_DBUS
+#ifdef SYSTEMD_LOGIND
 #include <dbus/dbus.h>
 
 typedef void (*dbus_core_connect_hook) (DBusConnection * connection,

config/meson.build

@@ -4,7 +4,7 @@ srcs_config = [
 
 config_dep = [common_dep]
 
-if build_dbus
+if build_systemd_logind
     srcs_config += 'dbus-core.c'
     config_dep += dbus_dep
 endif