Mesa (master): Export TLS support in gl.pc.

[Thomas Fogal]

Module: Mesa
Branch: master
Commit: 31351dc029ff0e12a250e3ffc509f4f01e025a24
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=31351dc029ff0e12a250e3ffc509f4f01e025a24

Author: Tom Fogal <tfogal at alumni.unh.edu>
Date:   Sun Dec  5 17:58:32 2010 -0700

Export TLS support in gl.pc.

---

 configs/autoconf.in |    1 +
 configure.ac        |    8 +++++++-
 src/mesa/Makefile   |    1 +
 src/mesa/gl.pc.in   |    1 +
 4 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3dceb1a..ff5ea6f 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 c00ecd0..9cbced5 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 0d1da01..25e7cce 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -129,6 +129,7 @@ gl_pcedit = sed \
 	-e 's, at GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
 	-e 's, at GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
 	-e 's, at GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+	-e 's, at GLX_TLS@,$(GLX_TLS),' \
 	-e 's, at GL_LIB@,$(GL_LIB),'
 
 gl.pc: gl.pc.in
diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
index 97b8659..2d3bc91 100644
--- a/src/mesa/gl.pc.in
+++ b/src/mesa/gl.pc.in
@@ -10,3 +10,4 @@ Version: @VERSION@
 Libs: -L${libdir} -l at GL_LIB@
 Libs.private: @GL_PC_LIB_PRIV@
 Cflags: -I${includedir} @GL_PC_CFLAGS@
+glx_tls: @GLX_TLS@