]>
Commit | Line | Data |
---|---|---|
53419e31 | 1 | --- configure.ac.orig 2010-08-30 22:19:47.937720469 +0200 |
2 | +++ configure.ac 2010-08-30 22:34:04.557727158 +0200 | |
3 | @@ -429,6 +429,7 @@ | |
4 | SELINUX_LIBS="-lselinux" | |
5 | DEFINES="$DEFINES -DMESA_SELINUX" | |
6 | fi | |
7 | + SELINUX_LIBS="-lselinux" | |
8 | ||
9 | dnl | |
10 | dnl Driver configuration. Options are xlib, dri and osmesa right now. | |
11 | @@ -568,11 +569,11 @@ | |
12 | PKG_CHECK_MODULES([XLIBGL], [x11 xext]) | |
13 | GL_PC_REQ_PRIV="x11 xext" | |
14 | X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" | |
15 | - GL_LIB_DEPS="$XLIBGL_LIBS" | |
16 | + GL_LIB_DEPS="$XLIBGL_LIBS $SELINUX_LIBS" | |
17 | else | |
18 | # should check these... | |
19 | X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" | |
20 | - GL_LIB_DEPS="$X_LIBS -lX11 -lXext" | |
21 | + GL_LIB_DEPS="$X_LIBS -lX11 -lXext $SELINUX_LIBS" | |
22 | GL_PC_LIB_PRIV="$GL_LIB_DEPS" | |
23 | GL_PC_CFLAGS="$X11_INCLUDES" | |
24 | fi | |
25 | @@ -610,7 +611,7 @@ | |
26 | PKG_CHECK_MODULES([DRIGL], [$dri_modules]) | |
27 | GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" | |
28 | X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" | |
29 | - GL_LIB_DEPS="$DRIGL_LIBS" | |
30 | + GL_LIB_DEPS="$DRIGL_LIBS $SELINUX_LIBS" | |
31 | else | |
32 | # should check these... | |
33 | X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" | |
34 | @@ -623,12 +624,12 @@ | |
35 | PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx]) | |
36 | GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx" | |
37 | X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS" | |
38 | - GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS" | |
39 | + GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS $SELINUX_LIBS" | |
40 | fi | |
41 | fi | |
42 | ||
43 | # need DRM libs, -lpthread, etc. | |
44 | - GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" | |
45 | + GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS $SELINUX_LIBS" | |
46 | GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" | |
47 | GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" | |
48 | GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" |