From ca46ff2845954fa1718affdebbd9470a9832e6bc Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 13 May 2024 17:17:41 +0200 Subject: [PATCH] (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 --- config/dbus-core.h | 2 +- config/meson.build | 2 +- include/meson.build | 2 -- meson.build | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/dbus-core.h b/config/dbus-core.h index d6260dc66..40108923d 100644 --- a/config/dbus-core.h +++ b/config/dbus-core.h @@ -26,7 +26,7 @@ #ifndef DBUS_CORE_H #define DBUS_CORE_H -#ifdef NEED_DBUS +#ifdef SYSTEMD_LOGIND #include typedef void (*dbus_core_connect_hook) (DBusConnection * connection, diff --git a/config/meson.build b/config/meson.build index 0a8368160..3caa1becf 100644 --- a/config/meson.build +++ b/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 diff --git a/include/meson.build b/include/meson.build index 955120ee3..61eb59b44 100644 --- a/include/meson.build +++ b/include/meson.build @@ -93,9 +93,7 @@ conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false) conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false) conf_data.set('CONFIG_UDEV', build_udev ? '1' : false) conf_data.set('CONFIG_UDEV_KMS', build_udev_kms ? '1' : false) -conf_data.set('HAVE_DBUS', build_dbus ? '1' : false) conf_data.set('SYSTEMD_LOGIND', build_systemd_logind ? '1' : false) -conf_data.set('NEED_DBUS', build_systemd_logind ? '1' : false) conf_data.set('CONFIG_WSCONS', host_machine.system() in ['openbsd', 'netbsd'] ? '1' : false) conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false) diff --git a/meson.build b/meson.build index 07c474f7b..8e7ebcd8e 100644 --- a/meson.build +++ b/meson.build @@ -299,8 +299,6 @@ if int10 == 'auto' endif endif -build_dbus = build_systemd_logind - udev_dep = dependency('', required:false) if build_udev or build_udev_kms udev_dep = dependency('libudev', version: '>= 143')