--- lib/GL/mesa/main/Imakefile	2004-06-16 02:25:10.000000000 -0700
+++ lib/GL/mesa/main/Imakefile	2004-08-18 14:30:08.619993000 -0700
@@ -1,3 +1,4 @@
+XCOMM $XdotOrg: $
 XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
 
 #include <Threads.tmpl>
@@ -26,6 +27,11 @@
 #define DoProfileLib NO
 #endif
 
+/* Large PIC tables needed for Solaris/SPARC builds */
+#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
+# define LargePICTable YES
+#endif
+
 #if Malloc0ReturnsNull
 ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 #endif
--- lib/GL/mesa/sparc/Imakefile	2004-06-16 02:25:10.000000000 -0700
+++ lib/GL/mesa/sparc/Imakefile	2004-08-16 17:47:43.017395000 -0700
@@ -1,4 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $
+XCOMM $XdotOrg: $
 
 /*
  * Need both shared and unshared Mesa objects in the following cases:
@@ -36,7 +37,13 @@
       DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
      INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \
 		-I$(MESASRCDIR)/src/SPARC \
-		-I../../../include
+		-I../../../include \
+                -I$(MESASRCDIR)/include \
+                -I$(GLXLIBSRC)/include \
+                -I$(MESASRCDIR)/src/mesa \
+                -I$(MESASRCDIR)/src/mesa/main \
+                -I$(MESASRCDIR)/src/mesa/sparc \
+                -I$(MESASRCDIR)/src/mesa/glapi
 
          SRCS = $(MESA_ASM_SRCS)
          OBJS = $(MESA_ASM_OBJS)
--- programs/Xserver/GL/glx/Imakefile	2004-06-21 06:22:30.000000000 -0700
+++ programs/Xserver/GL/glx/Imakefile	2004-08-16 17:47:43.018098000 -0700
@@ -9,6 +9,12 @@
 # endif
 #endif
 
+/* Large PIC tables needed for SPARC builds */
+#if defined(sparc) || defined(SparcArchitecture)
+# define LargePICTable YES
+   PICFLAGS = LargePositionIndependentCFlags
+#endif
+
 #include <Server.tmpl>
 
 LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common)
--- programs/Xserver/GL/mesa/main/Imakefile	2004-06-16 02:25:15.000000000 -0700
+++ programs/Xserver/GL/mesa/main/Imakefile	2004-08-18 14:35:27.806813000 -0700
@@ -1,3 +1,4 @@
+XCOMM $XdotOrg: $
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
 
 #if DoLoadableServer
@@ -9,6 +10,11 @@
 #endif
 #endif
 
+/* Large PIC tables needed for Solaris/SPARC builds */
+#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
+   PICFLAGS = LargePositionIndependentCFlags
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
--- programs/Xserver/GL/mesa/swrast/Imakefile	2004-06-16 02:25:15.000000000 -0700
+++ programs/Xserver/GL/mesa/swrast/Imakefile	2004-08-18 14:35:41.091376000 -0700
@@ -9,6 +9,11 @@
 #endif
 #endif
 
+/* Large PIC tables needed for Solaris/SPARC builds */
+#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
+   PICFLAGS = LargePositionIndependentCFlags
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
--- programs/Xserver/GL/mesa/tnl/Imakefile	2004-06-16 02:25:15.000000000 -0700
+++ programs/Xserver/GL/mesa/tnl/Imakefile	2004-08-18 14:33:07.241212000 -0700
@@ -1,3 +1,4 @@
+XCOMM $XdotOrg: $
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $
 
 #if DoLoadableServer
@@ -9,6 +10,12 @@
 #endif
 #endif
 
+/* Large PIC tables needed for Solaris/SPARC builds */
+#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
+   PICFLAGS = LargePositionIndependentCFlags
+#endif
+
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc