summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-06-20 19:01:34 -0700
committerAlan Coopersmith <alanc@alf.(none)>2006-06-20 19:01:34 -0700
commitf68ecfa482b2c2037f929710310c7b9ce6fe9291 (patch)
tree580d547fc565137fdff942a17e4cc1a8f50984bb /Xext
parenta46c06dab8392cf8012c7cc0b916de9a9e569671 (diff)
Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying to build XC-Security without X-ACE - Added XACE #define to dix-config.h - Added X-ACE sources to Xext/Makefile.am
Diffstat (limited to 'Xext')
-rw-r--r--Xext/Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 56c50538b..b5a135568 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -65,6 +65,13 @@ if XINERAMA
BUILTIN_SRCS += $(XINERAMA_SRCS)
endif
+# X-ACE extension: provides hooks for building security policy extensions
+# like XC-Security, X-SELinux & XTSol
+XACE_SRCS = xace.c xace.h xacestr.h
+if XACE
+BUILTIN_SRCS += $(XACE_SRCS)
+endif
+
# Security extension: multi-level security to protect clients from each other
XCSECURITY_SRCS = security.c
if XCSECURITY
@@ -149,6 +156,7 @@ EXTRA_DIST = \
$(XV_SRCS) \
$(RES_SRCS) \
$(SCREENSAVER_SRCS) \
+ $(XACE_SRCS) \
$(XCSECURITY_SRCS) \
$(XINERAMA_SRCS) \
$(XEVIE_SRCS) \