summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-01-31 23:25:10 +0100
committerKeith Packard <keithp@keithp.com>2011-02-02 14:55:58 -0800
commit0b15033031d78836582bd1b641c3160c3803a708 (patch)
tree267d0ede917604a4859ca23f441f799770223b5b
parent541b25038a5de74411a094570b407c5ae018c2ba (diff)
xserver: enable TLS even if AIGLX is not enabled
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 <samuel.thibault@ens-lyon.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 628760e7e..9b3e2be2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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