3 files changed, 14 insertions, 7 deletions
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 04c8ec789f8..8b15532e3c0 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -3,9 +3,6 @@
 
 Import('*')
 
-if not env['dri']:
-    Return()
-
 drienv = env.Clone()
 
 drienv.Replace(CPPPATH = [
@@ -30,6 +27,11 @@ drienv.Replace(CPPPATH = [
     '#src/egl/drivers/dri',
 ])
 
+driswenv = drienv.Clone()
+driswenv.Append(CPPDEFINES = [
+    '__NOT_HAVE_DRM_H',
+])
+
 drienv.PkgUseModules('DRM')
 
 dri_common_utils = drienv.SharedObject(
@@ -47,9 +49,9 @@ dri_common_dri_util = drienv.SharedObject(
     source = '#src/mesa/drivers/dri/common/dri_util.c'
 )
 
-dri_common_drisw_util = drienv.SharedObject(
+dri_common_drisw_util = driswenv.SharedObject(
     target = 'drisw_util.o',
-    source = '#src/mesa/drivers/dri/common/drisw_util.c'
+    source = '#src/mesa/drivers/dri/common/dri_util.c'
 )
 
 
@@ -69,8 +71,13 @@ drienv.AppendUnique(LIBS = [
     'expat',
 ])
 
+driswenv.AppendUnique(LIBS = [
+    'expat',
+])
+
 Export([
     'drienv',
+    'driswenv',
     'COMMON_DRI_SW_OBJECTS',
     'COMMON_DRI_DRM_OBJECTS',
 ])
diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index cdbda976457..5d2f1463868 100644
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -44,7 +44,7 @@ dri_LTLIBRARIES = swrast_dri.la
 swrast_dri_la_SOURCES = \
 	swrast_drm_api.c \
 	$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
-	$(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \
+	$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
 	$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
 
 swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
index 6b64c56413c..8ddd14ea5a7 100644
--- a/src/gallium/targets/dri-swrast/SConscript
+++ b/src/gallium/targets/dri-swrast/SConscript
@@ -1,6 +1,6 @@
 Import('*')
 
-env = drienv.Clone()
+env = driswenv.Clone()
 
 env.Append(CPPPATH = [
     '#/src/gallium/winsys/sw/dri',