Re: [PATCH xserver 6/7] meson: Refine build_dbus

[Eric Anholt]

Jon Turney  writes:

> As in autotools build, only turn on build_dbus (build dbus-core.c) if it's
> needed by build_hal or build_systemd_logind, not just because dbus is
> available.
>
> Building dbus-core.c without NEED_DBUS defined fails, as the contents of
> dbus-core.h are turned off.

I got confused by dbus/hal/systemd requirements several times.  Thanks
for fixing it up.

Acked-by: Eric Anholt 


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 6/7] meson: Refine build_dbus

[Jon Turney]

As in autotools build, only turn on build_dbus (build dbus-core.c) if it's
needed by build_hal or build_systemd_logind, not just because dbus is
available.

Building dbus-core.c without NEED_DBUS defined fails, as the contents of
dbus-core.h are turned off.

Signed-off-by: Jon Turney 
---
 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 5f30b996c..d3e0685bd 100644
--- a/meson.build
+++ b/meson.build
@@ -72,10 +72,8 @@ if host_machine.system() == 'windows'
 hal_option = 'no'
 endif
 
-build_dbus = dbus_dep.found()
-
 if get_option('systemd_logind') == 'auto'
-build_systemd_logind = build_udev and build_dbus
+build_systemd_logind = build_udev and dbus_dep.found()
 else
 build_systemd_logind = get_option('systemd_logind') == 'yes'
 endif
@@ -177,6 +175,8 @@ if build_udev and build_hal
 error('Hotplugging through both libudev and hal not allowed')
 endif
 
+build_dbus = build_hal or build_systemd_logind
+
 udev_dep = []
 if build_udev
 udev_dep = dependency('libudev', version: '>= 143')
-- 
2.12.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel