diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-11-12 16:40:37 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-11-17 12:26:38 -0500 |
| commit | ee87f7becc2138348ec0d948829db6e86cee86da (patch) | |
| tree | 2fcf5e75603ecaecd222de2022907c6c3c9c401a /configure.ac | |
| parent | 3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef (diff) | |
| parent | a5b1e62337d4e8840347bb186db48697f0690a19 (diff) | |
Merge commit 'origin/master' into dri2
Conflicts:
src/i830_dri.c
src/i830_driver.c
src/i830_memory.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 0789e2a3..41438ecd 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]) |