--- xorg-server-1.5.3/configure.ac.old	2009-03-25 11:48:59.000000000 +0200
+++ xorg-server-1.5.3/configure.ac	2009-03-25 11:57:23.000000000 +0200
@@ -1207,6 +1207,10 @@
 if test "x$XVFB" = xyes; then
 	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
 	XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
+	if test "x$GLX_USE_TLS" = xyes; then
+		XVFB_SYS_LIBS="$XVFB_SYS_LIBS -lpthread"
+		XVFB_DEFINES="-DPTHREADS"
+	fi
 	AC_SUBST([XVFB_LIBS])
 	AC_SUBST([XVFB_SYS_LIBS])
 fi
@@ -1225,6 +1229,10 @@
 if test "x$XNEST" = xyes; then
 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
+	if test "x$GLX_USE_TLS" = xyes; then
+		XNEST_SYS_LIBS="$XNEST_SYS_LIBS -lpthread"
+		XNEST_DEFINES="-DPTHREADS"
+	fi
 	AC_SUBST([XNEST_LIBS])
 	AC_SUBST([XNEST_SYS_LIBS])
 fi
@@ -1957,6 +1965,11 @@
     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
     KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
 
+    if test "x$GLX_USE_TLS" = xyes; then
+	KDRIVE_LIBS="$KDRIVE_LIBS -lpthread"
+	KDRIVE_CFLAGS="$KDRIVE_CFLAGS -DPTHREADS"
+    fi
+
     # check if we can build Xephyr
     PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])