From 19d7edb4301ac2c4ad3d7f7512214dad2414d64b Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 10 Feb 2018 10:04:27 +0100 Subject: [PATCH] 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 ++-- meson.build | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 diff --git a/meson.build b/meson.build index 236abd6b..a2f08446 100644 --- a/meson.build +++ b/meson.build @@ -159,10 +159,10 @@ summary = [ '----------------', 'wlroots @0@'.format(meson.project_version()), '', - ' libcap: @0@'.format(get_option('enable_libcap')), - ' systemd: @0@'.format(get_option('enable_systemd')), - ' elogind: @0@'.format(get_option('enable_elogind')), - ' xwayland: @0@'.format(get_option('enable_xwayland')), + ' libcap: @0@'.format(conf_data.get('WLR_HAS_LIBCAP', false)), + ' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)), + ' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)), + ' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)), '----------------', '' ]