diff options
| -rw-r--r-- | configs/autoconf.in | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/mesa/Makefile | 1 | ||||
| -rw-r--r-- | src/mesa/gl.pc.in | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 3dceb1a6b0..ff5ea6f862 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -32,6 +32,7 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ LLVM_LIBS = @LLVM_LIBS@ GLW_CFLAGS = @GLW_CFLAGS@ GLUT_CFLAGS = @GLUT_CFLAGS@ +GLX_TLS = @GLX_TLS@ TALLOC_LIBS = @TALLOC_LIBS@ TALLOC_CFLAGS = @TALLOC_CFLAGS@ diff --git a/configure.ac b/configure.ac index c00ecd0260..9cbced5688 100644 --- a/configure.ac +++ b/configure.ac @@ -808,13 +808,19 @@ if test "$mesa_driver" = xlib; then fi dnl -dnl More DRI setup +dnl TLS detection dnl + AC_ARG_ENABLE([glx-tls], [AS_HELP_STRING([--enable-glx-tls], [enable TLS support in GLX @<:@default=disabled@:>@])], [GLX_USE_TLS="$enableval"], [GLX_USE_TLS=no]) +AC_SUBST(GLX_TLS, ${GLX_USE_TLS}) + +dnl +dnl More DRI setup +dnl dnl Directory for DRI drivers AC_ARG_WITH([dri-driverdir], [AS_HELP_STRING([--with-dri-driverdir=DIR], diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 0d1da016b3..25e7cce425 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -129,6 +129,7 @@ gl_pcedit = sed \ -e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \ -e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \ -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \ + -e 's,@GLX_TLS@,$(GLX_TLS),' \ -e 's,@GL_LIB@,$(GL_LIB),' gl.pc: gl.pc.in diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in index 97b86596fc..2d3bc917ec 100644 --- a/src/mesa/gl.pc.in +++ b/src/mesa/gl.pc.in @@ -10,3 +10,4 @@ Version: @VERSION@ Libs: -L${libdir} -l@GL_LIB@ Libs.private: @GL_PC_LIB_PRIV@ Cflags: -I${includedir} @GL_PC_CFLAGS@ +glx_tls: @GLX_TLS@ |