From 8a3ae555efb02b3811cca0bfb4ddaf8fe1457778 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 9 Aug 2018 13:02:41 -0700 Subject: [PATCH] meson: Add an option to build XSELINUX. Dependencies are ported from the automake build. v2: Make it a tristate defaulting to 'auto'. Use pkg-config for libaudit. Signed-off-by: Eric Anholt Reviewed-by: Adam Jackson --- meson.build | 20 +++++++++++++++++--- meson_options.txt | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index e7ce68a50..53cdbe2be 100644 --- a/meson.build +++ b/meson.build @@ -442,9 +442,6 @@ elif get_option('mitshm') == 'true' build_mitshm = true endif -# XXX: Allow configuration of these. -build_xselinux = false - m_dep = cc.find_library('m', required : false) dl_dep = cc.find_library('dl', required : false) @@ -506,6 +503,23 @@ inc = include_directories( 'xfixes', ) +build_xselinux = false +if get_option('xselinux') != 'false' + dep_selinux = dependency('libselinux', version: '>= 2.0.86', + required: get_option('xselinux') == 'true') + dep_audit = dependency('audit', required: get_option('xselinux') == 'true') + if get_option('xselinux') == 'true' + build_xselinux = true + else + build_xselinux = dep_selinux.found() and dep_audit.found() + endif + + if build_xselinux + common_dep += dep_selinux + common_dep += dep_audit + endif +endif + glx_inc = include_directories('glx') top_srcdir_inc = include_directories('.') diff --git a/meson_options.txt b/meson_options.txt index 8c600f398..3f02d5066 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -80,6 +80,8 @@ option('xres', type: 'boolean', value: true, description: 'XRes extension') option('xace', type: 'boolean', value: true, description: 'X-ACE extension') +option('xselinux', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', + description: 'XSELINUX extension') option('xinerama', type: 'boolean', value: true, description: 'Xinerama extension') option('xcsecurity', type: 'boolean', value: false,