frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-13 17:17:41 +02:00
parent 8d5ad4aafb
commit ca46ff2845
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/dbus-core.h
View File

@ -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,

2
config/meson.build
View File

@ -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

2
include/meson.build
View File

@ -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)

2
meson.build
View File

@ -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')