From 19d7edb4301ac2c4ad3d7f7512214dad2414d64b Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 10 Feb 2018 10:04:27 +0100
Subject: meson.build status: print actual build options in message

We were printing the option intent (true by default for all), but
some are disabled when a component is not found and this was not
reflected.
---
 backend/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backend/meson.build')

diff --git a/backend/meson.build b/backend/meson.build
index 9c8f5852..e769e889 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -33,11 +33,11 @@ else
 	backend_files += files('session/direct.c')
 endif
 
-if systemd.found() and get_option('enable_systemd')
+if conf_data.get('WLR_HAS_SYSTEMD', false)
 	backend_files += files('session/logind.c')
 endif
 
-if elogind.found() and get_option('enable_elogind')
+if conf_data.get('WLR_HAS_ELOGIND', false)
 	backend_files += files('session/logind.c')
 endif
 
-- 
cgit v1.2.3


From 435aec003376de1928106fa9644b026e36f6250a Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 10 Feb 2018 11:30:47 +0100
Subject: meson build: only link with deps when required by options

---
 backend/meson.build | 26 ++++++++++++++------------
 meson.build         | 12 +++++++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'backend/meson.build')

diff --git a/backend/meson.build b/backend/meson.build
index e769e889..beb3841c 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -27,6 +27,17 @@ backend_files = files(
 	'x11/backend.c',
 )
 
+backend_deps = [
+	wayland_server,
+	egl,
+	gbm,
+	libinput,
+	wlr_render,
+	wlr_protos,
+	drm,
+	pixman,
+]
+
 if host_machine.system().startswith('freebsd')
 	backend_files += files('session/direct-freebsd.c')
 else
@@ -35,26 +46,17 @@ endif
 
 if conf_data.get('WLR_HAS_SYSTEMD', false)
 	backend_files += files('session/logind.c')
+	backend_deps += systemd
 endif
 
 if conf_data.get('WLR_HAS_ELOGIND', false)
 	backend_files += files('session/logind.c')
+	backend_deps += elogind
 endif
 
 lib_wlr_backend = static_library(
 	'wlr_backend',
 	backend_files,
 	include_directories: wlr_inc,
-	dependencies: [
-		wayland_server,
-		egl,
-		gbm,
-		libinput,
-		systemd,
-		elogind,
-		wlr_render,
-		wlr_protos,
-		drm,
-		pixman,
-	],
+	dependencies: backend_deps,
 )
diff --git a/meson.build b/meson.build
index 43af94a8..6c8a3a8b 100644
--- a/meson.build
+++ b/meson.build
@@ -70,24 +70,28 @@ systemd        = dependency('libsystemd', required: get_option('enable_systemd')
 elogind        = dependency('libelogind', required: get_option('enable_elogind') == 'true')
 math           = cc.find_library('m', required: false)
 
+exclude_headers = []
+wlr_parts = []
+wlr_deps = []
+
 if xcb_icccm.found()
 	conf_data.set('WLR_HAS_XCB_ICCCM', true)
 endif
 
 if libcap.found() and get_option('enable_libcap') != 'false'
 	conf_data.set('WLR_HAS_LIBCAP', true)
+	wlr_deps += libcap
 endif
 
 if systemd.found() and get_option('enable_systemd') != 'false'
 	conf_data.set('WLR_HAS_SYSTEMD', true)
+	wlr_deps += systemd
 endif
 
 if elogind.found() and get_option('enable_elogind') != 'false'
 	conf_data.set('WLR_HAS_ELOGIND', true)
 endif
 
-exclude_headers = []
-wlr_parts = []
 if get_option('enable_xwayland')
 	subdir('xwayland')
 	wlr_parts += [lib_wlr_xwayland]
@@ -117,7 +121,7 @@ wlr_parts += [
 	lib_wlr_xcursor,
 ]
 
-wlr_deps = [
+wlr_deps += [
 	wayland_server,
 	wayland_client,
 	wayland_egl,
@@ -133,8 +137,6 @@ wlr_deps = [
 	xcb,
 	xcb_composite,
 	x11_xcb,
-	libcap,
-	systemd,
 	math,
 ]
 
-- 
cgit v1.2.3