diff -u -r1.159.4.3 configure.ac
--- configure.ac	13 Feb 2006 22:41:03 -0000	1.159.4.3
+++ configure.ac	14 Feb 2006 23:05:01 -0000
@@ -534,6 +534,12 @@
 if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([XLIB], [x11])
 	AC_SUBST(XLIB_CFLAGS)
+
+	if test "$ac_cv_sizeof_unsigned_long" = 8; then
+		GLX_CFLAGS=-D_XSERVER64
+	fi
+	AC_SUBST(GLX_CFLAGS)
+
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
 	test -d GL || mkdir GL
diff -u -r1.10.4.1 Makefile.am
--- GL/glx/Makefile.am	18 Jan 2006 07:21:41 -0000	1.10.4.1
+++ GL/glx/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -3,6 +3,7 @@
 AM_CFLAGS = \
 	@DIX_CFLAGS@ \
 	@GL_CFLAGS@ \
+	@GLX_CFLAGS@ \
 	@XLIB_CFLAGS@ \
 	-I@MESA_SOURCE@/include \
 	-I@MESA_SOURCE@/src/mesa/glapi \
diff -u -r1.4.4.1 Makefile.am
--- GL/mesa/Makefile.am	18 Jan 2006 07:21:41 -0000	1.4.4.1
+++ GL/mesa/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -2,8 +2,8 @@
 
 noinst_LTLIBRARIES = libGLcore.la
 
-libGLcore_la_CFLAGS = -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT -DXF86DRI \
-		-DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA
+libGLcore_la_CFLAGS = @GLX_CFLAGS@ -DUSE_MGL_NAMESPACE -UHAVE_CONFIG_H -DGLXEXT \
+		-DXF86DRI -DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA
 
 libGLcore_la_SOURCES = dummy.c
 libGLcore_la_LIBADD = main/libmain.la \
diff -u -r1.14.6.1 Makefile.am
--- GL/mesa/X/Makefile.am	18 Jan 2006 07:21:41 -0000	1.14.6.1
+++ GL/mesa/X/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -18,8 +18,8 @@
 
 # -DXFree86Server is required because the X11 driver in Mesa thinks that
 # symbol means "being built in the server"
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-            -DXFree86Server -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
+            -DXFree86Server -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
diff -u -r1.7.6.1 Makefile.am
--- GL/mesa/array_cache/Makefile.am	18 Jan 2006 07:21:41 -0000	1.7.6.1
+++ GL/mesa/array_cache/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libac.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.5.6.1 Makefile.am
--- GL/mesa/glapi/Makefile.am	18 Jan 2006 07:21:41 -0000	1.5.6.1
+++ GL/mesa/glapi/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libglapi.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE  @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.9.4.2 Makefile.am
--- GL/mesa/main/Makefile.am	10 Feb 2006 20:45:24 -0000	1.9.4.2
+++ GL/mesa/main/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmain.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.7.6.1 Makefile.am
--- GL/mesa/math/Makefile.am	18 Jan 2006 07:21:42 -0000	1.7.6.1
+++ GL/mesa/math/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmath.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.8.6.2 Makefile.am
--- GL/mesa/shader/Makefile.am	10 Feb 2006 20:45:24 -0000	1.8.6.2
+++ GL/mesa/shader/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libshader.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.5 Makefile.am
--- GL/mesa/shader/grammar/Makefile.am	2 Dec 2005 06:02:37 -0000	1.5
+++ GL/mesa/shader/grammar/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgrammar.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../../X \
diff -u -r1.5.6.1 Makefile.am
--- GL/mesa/shader/slang/Makefile.am	10 Feb 2006 21:44:43 -0000	1.5.6.1
+++ GL/mesa/shader/slang/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libslang.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../grammar \
diff -u -r1.7.6.2 Makefile.am
--- GL/mesa/swrast/Makefile.am	13 Feb 2006 10:52:06 -0000	1.7.6.2
+++ GL/mesa/swrast/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libswrast.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.7.6.1 Makefile.am
--- GL/mesa/swrast_setup/Makefile.am	18 Jan 2006 07:21:42 -0000	1.7.6.1
+++ GL/mesa/swrast_setup/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libss.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.7.6.2 Makefile.am
--- GL/mesa/tnl/Makefile.am	14 Feb 2006 02:32:41 -0000	1.7.6.2
+++ GL/mesa/tnl/Makefile.am	14 Feb 2006 23:05:01 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libtnl.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE @GLX_CFLAGS@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \