Export TLS support in gl.pc.

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3dceb1a6b00e3127daf26068e049b5dbc41e4abf..ff5ea6f86270f670e4ea7ea5a0e7cfb6e5c65ec1 100644 (file)
--- 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 c00ecd0260dd80736d7aa99d22f79248c2d42a72..9cbced568830a4de3f4d1b0f9c3d808d0c1c35a3 100644 (file)
--- 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 0d1da016b3e330caab87b080beb6718f6a221063..25e7cce425cdea4195060b26d49896bd609f2ea5 100644 (file)
--- 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 97b86596fcf49f33058d741d57f4248abc5de2e0..2d3bc917ece89892beb5f799f4cb8832a34aa892 100644 (file)
--- 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@