summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:03:09 +0100
committerKeith Packard <keithp@keithp.com>2012-07-09 23:28:37 -0700
commit6fb481d1251626456914d0012d6ca5a342bfdf71 (patch)
treeb9dbf24b20b0f94e7ddc3d6e989d27bad8d4cdad /mi
parent5d92ee4081a23a6b4d1f9ba2a98985f539f99312 (diff)
Move SELinux from extmod to built-in
Instead of letting it languish in extmod just because we want to configure bits of it from xf86, move XSELinux to the builtin part of Xext, and do its configuration from xf86ExtensionInit. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi')
-rw-r--r--mi/miinitext.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 74fb223fb..a8644db6b 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -416,6 +416,9 @@ static ExtensionModule staticExtensions[] = {
{XvExtensionInit, XvName, &noXvExtension, NULL},
{XvMCExtensionInit, XvMCName, &noXvExtension, NULL},
#endif
+#ifdef XSELINUX
+ {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension, NULL},
+#endif
};
/*ARGSUSED*/ void