|
 |
a2af23f |
From 823a13f90b5619823325ea162ae30d652e448492 Mon Sep 17 00:00:00 2001
|
|
|
a2af23f |
From: Adam Jackson <ajax@redhat.com>
|
|
|
a2af23f |
Date: Thu, 1 Nov 2007 10:39:57 -0400
|
|
|
a2af23f |
Subject: [PATCH] Link GL subsystem against libselinux.
|
|
|
a2af23f |
|
|
|
a2af23f |
---
|
|
|
a2af23f |
configure.ac | 4 +++-
|
|
|
a2af23f |
hw/xfree86/dixmods/Makefile.am | 2 +-
|
|
|
a2af23f |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
a2af23f |
|
|
|
a2af23f |
diff --git a/configure.ac b/configure.ac
|
|
|
a2af23f |
index 57132b0..a16b46a 100644
|
|
|
a2af23f |
--- a/configure.ac
|
|
|
a2af23f |
+++ b/configure.ac
|
|
|
a2af23f |
@@ -339,6 +339,8 @@ case $host_cpu in
|
|
|
a2af23f |
;;
|
|
|
a2af23f |
esac
|
|
|
a2af23f |
|
|
|
a2af23f |
+SYS_LIBS="${SYS_LIBS} -lselinux"
|
|
|
a2af23f |
+
|
|
|
a2af23f |
dnl BSD *_video.c selection
|
|
|
a2af23f |
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
|
|
|
a2af23f |
AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
|
|
|
a2af23f |
@@ -1229,7 +1231,7 @@ AC_MSG_RESULT([$XNEST])
|
|
|
a2af23f |
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
|
|
|
a2af23f |
|
|
|
a2af23f |
if test "x$XNEST" = xyes; then
|
|
|
a2af23f |
- XNEST_LIBS="$CONFIG_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB"
|
|
|
a2af23f |
+ XNEST_LIBS="$CONFIG_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $XSERVER_LIBS"
|
|
|
a2af23f |
XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
|
|
|
a2af23f |
AC_SUBST([XNEST_LIBS])
|
|
|
a2af23f |
AC_SUBST([XNEST_SYS_LIBS])
|
|
|
a2af23f |
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
|
|
|
a2af23f |
index efc5f4a..1b9ecfd 100644
|
|
|
a2af23f |
--- a/hw/xfree86/dixmods/Makefile.am
|
|
|
a2af23f |
+++ b/hw/xfree86/dixmods/Makefile.am
|
|
|
a2af23f |
@@ -50,7 +50,7 @@ INCLUDES = @XORG_INCS@ \
|
|
|
a2af23f |
-I$(top_srcdir)/GL/glx
|
|
|
a2af23f |
|
|
|
a2af23f |
libGLcore_la_LDFLAGS = -avoid-version
|
|
|
a2af23f |
-libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
|
|
|
a2af23f |
+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux
|
|
|
a2af23f |
libGLcore_la_SOURCES = GLcoremodule.c
|
|
|
a2af23f |
|
|
|
a2af23f |
libafb_la_LDFLAGS = -avoid-version
|
|
|
a2af23f |
--
|
|
|
a2af23f |
1.5.3.4
|
|
|
a2af23f |
|