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>
This commit is contained in:
Daniel Stone
2012-07-10 02:03:09 +01:00
committed by Keith Packard
parent 5d92ee4081
commit 6fb481d125
5 changed files with 33 additions and 37 deletions

View File

@@ -158,7 +158,7 @@ extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
#include <X11/extensions/XKB.h>
extern void XkbExtensionInit(void);
#if defined(XSELINUX) && !defined(XorgLoader)
#if defined(XSELINUX)
#include "xselinux.h"
extern Bool noSELinuxExtension;
extern void SELinuxExtensionInit(void);