Skip to content

Commit

Permalink
xserver: enable TLS even if AIGLX is not enabled
Browse files Browse the repository at this point in the history
This aligns the xorg server build with the mesa build, which is needed on
systems where aiglx with dri support is not enabled. Else the following error is
obtained when trying to load the software raster:

(EE) AIGLX error: dlopen of /usr/lib/dri/swrast_dri.so failed (/usr/lib/dri/swrast_dri.so: undefined symbol: _glapi_tls_Context)
(EE) GLX: could not load software renderer
(II) GLX: no usable GL providers found for screen 0

because mesa always enables TLS use in GLX, even if dri is not available.

Signed-off-by: Samuel Thibault <[email protected]>
Signed-off-by: Julien Cristau <[email protected]>
Signed-off-by: Keith Packard <[email protected]>
  • Loading branch information
sthibaul authored and keith-packard committed Feb 2, 2011
1 parent 541b250 commit 0b15033
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ else
fi
AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)

if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then
if test "x$GLX_USE_TLS" = xyes ; then
GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
fi
Expand Down

0 comments on commit 0b15033

Please sign in to comment.