From a06342eccc76035ff859fee4d283b288c90ee923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Tue, 28 Mar 2006 02:57:07 +0000
Subject: [PATCH] Add --enable-glx-tls ./configure option to enable use of TLS
 for storing     current GL context. Use this option to let AIGLX load DRI
 drivers     compiled for TLS.

---
 ChangeLog          | 7 +++++++
 GL/glx/Makefile.am | 3 ++-
 configure.ac       | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f7e0b83a7..09ce7e222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-27  Kristian Høgsberg  <krh@redhat.com>
+
+	* configure.ac:
+	* GL/glx/Makefile.am: Add --enable-glx-tls ./configure option to
+	enable use of TLS for storing current GL context.  Use this option
+	to let AIGLX load DRI drivers compiled for TLS.
+
 2006-03-27  Adam Jackson  <ajax@freedesktop.org>
 
 	* include/regionstr.h:
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 4e850798d..6e586f8d6 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -16,7 +16,8 @@ AM_CFLAGS = \
 	@SERVER_DEFINES@ \
 	@MODULE_DEFINES@ \
 	@LOADER_DEFINES@ \
-	-DNO_LIBCWRAPPER
+	-DNO_LIBCWRAPPER \
+	@GLX_DRI_DEFINES@
 
 # none yet
 #sdk_HEADERS =
diff --git a/configure.ac b/configure.ac
index 04d2b141a..da4bce125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,6 +393,8 @@ AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP ext
 AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
 AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
 AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]), [AIGLX=$enableval], [AIGLX=yes])
+AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]), [GLX_USE_TLS=$enableval], [GLX_USE_TLS=no])
+GLX_USE_TLS
 AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
 AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
@@ -576,6 +578,12 @@ else
 fi
 AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
 
+if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then
+	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
+	GLX_LIBS="GLX_LIBS -lpthread"
+fi
+AC_SUBST([GLX_DEFINES])
+
 PKG_CHECK_MODULES([LBXUTIL_TEST], [lbxutil], [have_lbxutil=yes], [have_lbxutil=no])
 
 if test "x$LBX" = xauto; then