--- Mesa-6.5.bak/configs/linux-dri	2006-03-31 19:29:46.000000000 +0200
+++ Mesa-6.5/configs/linux-dri	2006-06-16 15:21:58.813131375 +0200
@@ -63,5 +63,22 @@
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
+DRI_DIRS := i810 i915 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb
+
+ifeq ($(shell arch),ppc)
+ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
+ASM_SOURCES = $(PPC_SOURCES)
+endif
+
+ifeq ($(shell arch),x86_64)
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
+endif
+
+ifeq ($(patsubst i%86,x86,$(shell arch)),x86)
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
+endif