Index: lib/GL/mesa/drivers/osmesa/Imakefile
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/drivers/osmesa/Imakefile,v
retrieving revision 1.5
diff -u -r1.5 Imakefile
--- lib/GL/mesa/drivers/osmesa/Imakefile	1 Aug 2005 18:49:51 -0000	1.5
+++ lib/GL/mesa/drivers/osmesa/Imakefile	5 Sep 2005 13:33:03 -0000
@@ -13,6 +13,7 @@
 # define LargePICTable YES
 #endif
 
+#define NeedToLinkMesaSrc
 #include "../../array_cache/Imakefile.inc"
 #include "../../math/Imakefile.inc"
 #include "../../main/Imakefile.inc"
@@ -42,6 +43,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/glapi \
 		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/shader/slang \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/include 
 
Index: programs/Xserver/GL/mesa/GLcore/Imakefile
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v
retrieving revision 1.4
diff -u -r1.4 Imakefile
--- programs/Xserver/GL/mesa/GLcore/Imakefile	31 Jul 2005 17:19:25 -0000	1.4
+++ programs/Xserver/GL/mesa/GLcore/Imakefile	5 Sep 2005 13:33:24 -0000
@@ -12,6 +12,7 @@
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
+#define NeedToLinkMesaSrc
 #define MesaInXServer
 #define MesaBuildDir ../main/
 #define MesaACBuildDir ../array_cache/
@@ -53,6 +54,7 @@
      INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
 		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/shader/slang \
 		-I$(SERVERSRC)/include
 
       DEFINES = $(GLX_DEFINES)