--- xc/lib/GL/mesa/array_cache/Imakefile	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/array_cache/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -36,7 +36,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/main/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/12/20 22:30:49 alanc Exp $
+XCOMM $XdotOrg: $
 XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
 
 #include <Threads.tmpl>
@@ -44,7 +44,11 @@
  MATH_DEFINES = -DCCPML
 #endif
 
-      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \
+#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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/math/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -42,7 +42,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/shader/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/shader/grammar/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/library/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/swrast/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/swrast_setup/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/tnl/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -41,7 +41,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/tnl_dd/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -40,7 +40,7 @@
 #endif
 
 #if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  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	2005-12-22 22:13:50.000000000 +0000
+++ xc/lib/GL/mesa/x86/Imakefile	2005-12-16 22:18:16.000000000 +0000
@@ -33,7 +33,11 @@
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"
 
-      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(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 \