--- src/mesa/Makefile.old	2006-08-16 10:04:41.000000000 +0000
+++ src/mesa/Makefile	2006-08-16 10:04:11.000000000 +0000
@@ -150,10 +150,12 @@
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+ifndef NO_DRI_NO_DRM
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+endif
 
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
--- mesa-6.4.2.old/src/glx/x11/Makefile	2006-08-12 16:59:25.000000000 +0000
+++ mesa-6.4.2/src/glx/x11/Makefile	2006-08-12 17:00:02.000000000 +0000
@@ -33,7 +33,11 @@
 	  glx_query.c \
 	  glx_texture_compression.c \
 	  dri_glx.c \
-	  XF86dri.c \
+
+ifndef NO_DRI_NO_DRM
+C_SOURCES += \
+	XF86dri.c
+endif
 
 X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
 X86-64_SOURCES = $(TOP)/src/mesa/x86-64/glapi_x86-64.S
diff -urN mesa-6.4.2.old/src/Mesa/Makefile mesa-6.4.2/src/Mesa/Makefile
--- mesa-6.4.2.old/src/mesa/Makefile	2006-08-16 10:04:41.000000000 +0000
+++ mesa-6.4.2/src/mesa/Makefile	2006-08-16 10:04:11.000000000 +0000
@@ -150,10 +150,12 @@
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+ifndef NO_DRI_NO_DRM
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+endif
 
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)