andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add XACE and XSELINUX extensions to the build system

Browse Source
This commit is contained in:
Eamon Walsh 2004-05-05 20:15:41 +00:00
parent 0106715000
commit 8d4f21ab53
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2004/04/23 18:44:43 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1.4.3.4.1 2004/05/04 19:43:01 ewalsh Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */
#ifndef INITARGS
@ -124,7 +124,16 @@ extern void ShmRegisterFuncs(
ShmFuncsPtr funcs);
#endif
#ifdef XACE
extern void XaceExtensionInit(INITARGS);
#endif
#ifdef XSELINUX
extern void XSELinuxExtensionInit(INITARGS);
#endif
#if 1
extern void SecurityExtensionSetup(INITARGS);
extern void SecurityExtensionInit(INITARGS);
#endif

34
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.3 2004/04/26 11:07:03 gisburn Exp $ */
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.5.2.1 2004/05/04 19:44:01 ewalsh Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/***********************************************************
@ -122,10 +122,16 @@ typedef void (*InitExtension)(INITARGS);
#define _XAG_SERVER_
#include "Xagstr.h"
#endif
#ifdef XACE
#include "xace.h"
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
#include "securstr.h"
#endif
#ifdef XSELINUX
#include "xselinux.h"
#endif
#ifdef PANORAMIX
#include "panoramiXproto.h"
#endif
@ -210,9 +216,16 @@ extern void DbeExtensionInit(INITARGS);
#ifdef XAPPGROUP
extern void XagExtensionInit(INITARGS);
#endif
#ifdef XACE
extern void XaceExtensionInit(INITARGS);
#endif
#ifdef XCSECURITY
extern void SecurityExtensionSetup(INITARGS);
extern void SecurityExtensionInit(INITARGS);
#endif
#ifdef XSELINUX
extern void XSELinuxExtensionInit(INITARGS);
#endif
#ifdef XPRINT
extern void XpExtensionInit(INITARGS);
#endif
@ -270,6 +283,9 @@ InitExtensions(argc, argv)
int argc;
char *argv[];
{
#ifdef XCSECURITY
SecurityExtensionSetup();
#endif
#ifdef PANORAMIX
# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
if (!noPanoramiXExtension) PanoramiXExtensionInit();
@ -345,9 +361,15 @@ InitExtensions(argc, argv)
#ifdef XAPPGROUP
XagExtensionInit();
#endif
#ifdef XACE
XaceExtensionInit();
#endif
#ifdef XCSECURITY
SecurityExtensionInit();
#endif
#ifdef XSELINUX
XSELinuxExtensionInit();
#endif
#ifdef XPRINT
XpExtensionInit();
#endif
@ -447,7 +469,9 @@ ExtensionModule extension[] =
{ NULL, "LBX", NULL, NULL },
{ NULL, "DOUBLE-BUFFER", NULL, NULL },
{ NULL, "XC-APPGROUP", NULL, NULL },
{ NULL, "XAccessControlExtension", NULL, NULL },
{ NULL, "SECURITY", NULL, NULL },
{ NULL, "SELinux", NULL, NULL },
{ NULL, "XpExtension", NULL, NULL },
{ NULL, "XFree86-VidModeExtension", NULL, NULL },
{ NULL, "XFree86-Misc", NULL, NULL },
@ -501,8 +525,14 @@ static ExtensionModule staticExtensions[] = {
#ifdef XAPPGROUP
{ XagExtensionInit, XAGNAME, NULL, NULL, NULL },
#endif
#ifdef XACE
{ XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL },
#endif
#ifdef XCSECURITY
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, NULL, NULL },
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, SecurityExtensionSetup, NULL },
#endif
#ifdef XSELINUX
{ XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, NULL, NULL },
#endif
#ifdef XPRINT
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },