Mesa 6.3.1 merge

[Matthias Hopf]

On Jul 31, 05 12:30:08 -0400, Adam Jackson wrote:
> In preparation for the RC0 snapshots of 6.9 and 7.0, I'll be merging the new 
> version of Mesa into the monolith.  This should be stable once it's 
> completed, but don't try to check out the tree for a few hours.

Current CVS doesn't compile for me.
Find a patch attached that corrects the according Imakefiles.

Thanks

Matthias

-- 
Matthias Hopf <mhopf at suse.de>       __        __   __
Maxfeldstr. 5 / 90409 Nuernberg    (_   | |  (_   |__         mat at mshopf.de
Phone +49-911-74053-715            __)  |_|  __)  |__  labs   www.mshopf.de
-------------- next part --------------
Index: lib/GL/mesa/shader/grammar/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/shader/grammar/Imakefile,v
retrieving revision 1.1
diff -u -p -r1.1 Imakefile
--- lib/GL/mesa/shader/grammar/Imakefile        31 Jul 2005 17:19:24 -0000     1.1
+++ lib/GL/mesa/shader/grammar/Imakefile        9 Aug 2005 15:45:25 -0000
@@ -31,7 +31,7 @@ XCOMM $XFree86$
 # define LargePICTable YES
 #endif
 
-#define MesaShaderBuildDir /**/
+#define MesaGrammarBuildDir /**/
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"
 
cvs diff: Diffing lib/GL/mesa/shader/slang
Index: lib/GL/mesa/shader/slang/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/shader/slang/Imakefile,v
retrieving revision 1.1
diff -u -p -r1.1 Imakefile
--- lib/GL/mesa/shader/slang/Imakefile  31 Jul 2005 17:19:24 -0000      1.1
+++ lib/GL/mesa/shader/slang/Imakefile  9 Aug 2005 15:45:25 -0000
@@ -31,7 +31,7 @@ XCOMM $XFree86$
 # define LargePICTable YES
 #endif
 
-#define MesaShaderBuildDir /**/
+#define MesaSlangBuildDir /**/
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"