xf86-video-intel: configure.ac

[Jesse Barnes]

 configure.ac |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit ee3df629eaa388f09bec33ad04d443359d63ea7f
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Oct 20 18:46:49 2008 -0700

    Default kernel mode setting to off, add configure flag to enable
    
    Should help avoid unpleasantness.

diff --git a/configure.ac b/configure.ac
index d5db3a9..b7a9cc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,11 @@ AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
               [XVMC="$enableval"],
               [XVMC=auto])
 
+AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
+                                  [Enable kernel mode setting support [[default=no]]]),
+              [KMS="$enableval"],
+              [KMS=no])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -107,13 +112,15 @@ if test x$DRI != xno; then
                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
 	AC_CHECK_FILE([${sdkdir}/damage.h],
                       [have_damage_h="yes"], [have_damage_h="no"])
-	AC_CHECK_HEADER(xf86drmMode.h,
-			[DRM_MODE=yes],[DRM_MODE=no]
-			[#include "stdint.h"])
-	dnl exaGetPixmapDriverPrivate required for DRM_MODE.
-	PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
-	if test "x$DRM_MODE" = xyes; then
-	   	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
+	if test x$KMS != xno; then
+		AC_CHECK_HEADER(xf86drmMode.h,
+				[DRM_MODE=yes],[DRM_MODE=no]
+				[#include "stdint.h"])
+		dnl exaGetPixmapDriverPrivate required for DRM_MODE.
+		PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
+		if test "x$DRM_MODE" = xyes; then
+	   		AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
+		fi
 	fi
 fi
 AC_MSG_CHECKING([whether to include DRI support])