[Intel-gfx] [RFC] Remove --disable-dri config option

[Zhenyu Wang]

I think this option should have no future user, and is broken now.
So instead of fixing it, how about remove this option and make it auto
detect by default?

---
 configure.ac |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index 88059bf..d213d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,11 +60,6 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-                                  [Disable DRI support [[default=auto]]]),
-              [DRI="$enableval"],
-              [DRI=auto])
-
 AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug],
                                   [Enable video debugging support [[default=no]]]),
               [VIDEO_DEBUG="$enableval"],
@@ -108,24 +103,21 @@ AC_HEADER_STDC
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
 CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags"
+
+AC_CHECK_FILE([${sdkdir}/dri.h],
+		[have_dri_h="yes"], [have_dri_h="no"])
+AC_CHECK_FILE([${sdkdir}/sarea.h],
+		[have_sarea_h="yes"], [have_sarea_h="no"])
+AC_CHECK_FILE([${sdkdir}/dristruct.h],
+		[have_dristruct_h="yes"], [have_dristruct_h="no"])
+
 AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI != xno; then
-        AC_CHECK_FILE([${sdkdir}/dri.h],
-                      [have_dri_h="yes"], [have_dri_h="no"])
-        AC_CHECK_FILE([${sdkdir}/sarea.h],
-                      [have_sarea_h="yes"], [have_sarea_h="no"])
-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
-fi
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
-        if test "$have_dri_h" = yes -a \
-                "$have_sarea_h" = yes -a \
-                "$have_dristruct_h" = yes; then
-                DRI="yes"
-        else
-                DRI="no"
-        fi
+if test "$have_dri_h" = yes -a \
+	"$have_sarea_h" = yes -a \
+	"$have_dristruct_h" = yes; then
+	DRI="yes"
+else
+	DRI="no"
 fi
 AC_MSG_RESULT([$DRI])
 
-- 
1.6.2.1