diff --git a/configure.ac b/configure.ac
index 18a40fc..f88e5a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1081,7 +1081,9 @@ if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
     DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
     DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
     DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
-    DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+    DRI_LDFLAGS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR)'
+    DRI_LIBS='-ldricore -lglsl'
+    DRI_LIB_DEPS="$(DRI_LDFLAGS) $(DRI_LIBS)"
     DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
     DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
     MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
@@ -1091,6 +1093,7 @@ AC_SUBST([DRICORE_GLSL_LIBS])
 AC_SUBST([DRICORE_LIB_DEPS])
 AC_SUBST([DRI_CXXFLAGS])
 AC_SUBST([DRI_CFLAGS])
+AC_SUBST([DRI_LDFLAGS])
 AC_SUBST([MESA_MODULES])
 
 AC_SUBST([HAVE_XF86VIDMODE])
@@ -1263,10 +1266,12 @@ if test "x$enable_dri" = xyes; then
 
     # put all the necessary libs together
     DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+    DRI_LIBS="$DRI_LIBS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
 fi
 AC_SUBST([DRI_DIRS])
 AC_SUBST([EXPAT_INCLUDES])
 AC_SUBST([DRI_LIB_DEPS])
+AC_SUBST([DRI_LIBS])
 
 case $DRI_DIRS in
 *i915*|*i965*)
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 5512381..219308c 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -59,10 +59,9 @@ i965_dri_la_SOURCES = \
 	$(i965_CXX_FILES) \
 	$(COMMON_FILES)
 
-i965_dri_la_LDFLAGS = -module -avoid-version -shared
+i965_dri_la_LDFLAGS = -module -avoid-version -shared $(DRI_LDFLAGS)
 i965_dri_la_LIBADD = \
-	$(DRI_LIB_DEPS) \
-	$(DRICORE_LIB_DEPS) \
+	$(DRI_LIBS) \
 	$(INTEL_LIBS)
 
 # Test build to make sure that we didn't leave any undefined symbols in the