Just mimic autoconf file, Security extension needs X-ACE extension

Signed-off-by: Laurent Carlier <lordhea...@gmail.com>
---
 meson.build       | 8 +++++++-
 meson_options.txt | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 59a0c59..52aaac5 100644
--- a/meson.build
+++ b/meson.build
@@ -346,11 +346,17 @@ build_res = get_option('xres')
 build_xace = get_option('xace')
 build_xinerama = get_option('xinerama')
 
+build_xsecurity = get_option('xcsecurity')
+if build_xsecurity
+    if not build_xace
+        error('cannot build Security extension without X-ACE')
+    endif
+endif
+
 # XXX: Allow configuration of these.
 build_apm = false
 build_acpi = false
 build_mitshm = true
-build_xsecurity = true
 build_xselinux = false
 build_xv = true
 build_dga = false
diff --git a/meson_options.txt b/meson_options.txt
index 0ae53d5..273ebaa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -69,6 +69,8 @@ option('xace', type: 'boolean', value: true,
        description: 'X-ACE extension')
 option('xinerama', type: 'boolean', value: true,
        description: 'Xinerama extension')
+option('xcsecurity', type: 'boolean', value: false,
+       description: 'Security extension')
 
 option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 
'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 
'auto', description: 'Build DRI2 extension (default: auto)')
-- 
2.16.1

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to