[PATCH xserver] meson: Add an option to build XSELINUX.

[Eric Anholt]

Peter Hutterer <peter.hutterer at who-t.net> writes:

> On Thu, Aug 09, 2018 at 01:02:41PM -0700, Eric Anholt wrote:
>> 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 <eric at anholt.net>
>> ---
>>  meson.build       | 20 +++++++++++++++++---
>>  meson_options.txt |  2 ++
>>  2 files changed, 19 insertions(+), 3 deletions(-)
>> 
>> diff --git a/meson.build b/meson.build
>> index e7ce68a502c3..53cdbe2beb3d 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
>
> you don't need the if here, if option(xselinux) is true, both deps will
> are required and cannot be anything but found() == true.
>
> but either way, Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

I'm trying to make sure that build_xselinux is never set if the tristate
is set to false, but that we auto-select if we're in auto mode.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20180809/91e96ad3/attachment.sig>