--- a/open-src/xserver/xorg/Makefile Thu Feb 15 16:56:35 2007 -0800
+++ b/open-src/xserver/xorg/Makefile Thu Feb 15 17:00:05 2007 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.31 07/02/02
+# @(#)Makefile 1.32 07/02/15
#
PWD:sh=pwd
@@ -166,6 +166,7 @@
-I $(PROTODIR)$(X11_INCLUDES_DIR) \
-I $(PROTODIR)$(X11_INCLUDES_DIR)/drm \
-I $(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri \
+ -I $(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions \
$(DPMS_DEFINES) -DSUNSOFT -DTSOL
# Uncomment to build debug
--- a/open-src/xserver/xorg/sun-src/hw/xfree86/dixmods/tsolmodule.c Thu Feb 15 16:56:35 2007 -0800
+++ b/open-src/xserver/xorg/sun-src/hw/xfree86/dixmods/tsolmodule.c Thu Feb 15 17:00:05 2007 -0800
@@ -26,12 +26,16 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolmodule.c 1.4 07/01/31 SMI"
+#pragma ident "@(#)tsolmodule.c 1.5 07/02/15 SMI"
/*
* X Trusted Extension module for X.org X server
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "xf86Module.h"
static MODULESETUPPROTO(xtsolSetup);
--- a/open-src/xserver/xorg/sun-src/tsol/Makefile.am Thu Feb 15 16:56:35 2007 -0800
+++ b/open-src/xserver/xorg/sun-src/tsol/Makefile.am Thu Feb 15 17:00:05 2007 -0800
@@ -29,7 +29,7 @@
#
#########################################################################
#
-# ident "@(#)Makefile.am 1.7 07/01/24 SMI"
+# ident "@(#)Makefile.am 1.8 07/02/15 SMI"
#
noinst_LTLIBRARIES = libxtsol.la
@@ -43,6 +43,6 @@
TSOLPOLICYFILEDEF = -DTSOLPOLICYFILE=\"$(SERVERCONFIGdir)/TrustedExtensionsPolicy\"
-AM_CFLAGS = $(DIX_CFLAGS) $(TSOLPOLICYFILEDEF)
+AM_CFLAGS = $(DIX_CFLAGS) $(TSOLPOLICYFILEDEF) -DIN_MODULE
libxtsol_la_LIBADD = -ltsol -ltsnet -ltlc -lsecdb -lbsm