luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-29 08:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
meson: Turn selinux into a meson feature and make it auto by default

See merge request GNOME/glib!483
This commit is contained in:
Xavier Claessens 2018-11-20 19:14:52 +00:00
commit f54b48b3e6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -1812,9 +1812,10 @@ if host_system == 'windows'
endif endif
selinux_dep = [] selinux_dep = []
if host_system == 'linux' and get_option('selinux') if host_system == 'linux'
selinux_dep = [dependency('libselinux')] selinux_dep = dependency('libselinux', required: get_option('selinux'))
glib_conf.set('HAVE_SELINUX', 1)
glib_conf.set('HAVE_SELINUX', selinux_dep.found())
endif endif
xattr_dep = [] xattr_dep = []

4
meson_options.txt
View File

@ -20,8 +20,8 @@ option('gio_module_dir',
description : 'load gio modules from this directory (default to \'libdir/gio/modules\' if unset)') description : 'load gio modules from this directory (default to \'libdir/gio/modules\' if unset)')
option('selinux', option('selinux',
type : 'boolean', type : 'feature',
value : true, value : 'auto',
description : 'build with selinux support') description : 'build with selinux support')
option('xattr', option('xattr',