diff --git a/configure.ac b/configure.ac
index 96e918ad9..14f936c62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1947,7 +1947,7 @@ if test "x$XORG" = xyes; then
 	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
 	fi
 
-	if test "x$DRM" = xyes; then
+	if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
 		XORG_DRIVER_MODESETTING=yes
 	fi