--- xc/lib/GL/mesa/array_cache/Imakefile.orig	2005-11-18 21:02:13.000000000 +0000
+++ xc/lib/GL/mesa/array_cache/Imakefile	2005-11-18 21:03:02.000000000 +0000
@@ -36,7 +36,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/main/Imakefile.orig	2005-11-18 21:03:21.000000000 +0000
+++ xc/lib/GL/mesa/main/Imakefile	2005-11-18 21:03:44.000000000 +0000
@@ -44,7 +44,11 @@
  MATH_DEFINES = -DCCPML
 #endif
 
-      DEFINES = $(ALLOC_DEFINES) GlxDefines \
+#if BuildXF86DRI
+   DRI_DEFINES = -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
+#endif
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines $(DRI_DEFINES) \
 		$(MESA_ASM_DEFINES) $(MATH_DEFINES)
      INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \
 		-I$(MESASRCDIR)/src/mesa/glapi \
--- xc/lib/GL/mesa/math/Imakefile.orig	2005-11-18 21:04:22.000000000 +0000
+++ xc/lib/GL/mesa/math/Imakefile	2005-11-18 21:04:42.000000000 +0000
@@ -42,7 +42,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/shader/Imakefile.orig	2005-11-18 21:05:25.000000000 +0000
+++ xc/lib/GL/mesa/shader/Imakefile	2005-11-18 21:05:42.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/shader/grammar/Imakefile.orig	2005-11-18 21:07:19.000000000 +0000
+++ xc/lib/GL/mesa/shader/grammar/Imakefile	2005-11-18 21:07:35.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/shader/slang/library/Imakefile.orig	2005-11-18 21:14:37.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/library/Imakefile	2005-11-18 21:14:57.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/shader/slang/Imakefile.orig	2005-11-18 21:08:04.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/Imakefile	2005-11-18 21:08:21.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/swrast/Imakefile.orig	2005-11-18 21:09:08.000000000 +0000
+++ xc/lib/GL/mesa/swrast/Imakefile	2005-11-18 21:09:25.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/swrast_setup/Imakefile.orig	2005-11-18 21:09:37.000000000 +0000
+++ xc/lib/GL/mesa/swrast_setup/Imakefile	2005-11-18 21:09:49.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/tnl/Imakefile.orig	2005-11-18 21:10:01.000000000 +0000
+++ xc/lib/GL/mesa/tnl/Imakefile	2005-11-18 21:10:15.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
 #endif
--- xc/lib/GL/mesa/tnl_dd/Imakefile.orig	2005-11-18 21:10:27.000000000 +0000
+++ xc/lib/GL/mesa/tnl_dd/Imakefile	2005-11-18 21:10:40.000000000 +0000
@@ -40,7 +40,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
 		-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
 		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
--- xc/lib/GL/mesa/x86/Imakefile.orig	2005-11-18 21:10:54.000000000 +0000
+++ xc/lib/GL/mesa/x86/Imakefile	2005-11-18 21:11:14.000000000 +0000
@@ -33,7 +33,11 @@
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"
 
-      DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
+#if BuildXF86DRI
+  DRI_DEFINES = -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
+#endif
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines $(DRI_DEFINES) $(MESA_ASM_DEFINES)
      INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/include \
 		-I$(GLXLIBSRC)/include \