diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-06 10:55:59 -0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-01-07 18:52:14 +0800 |
| commit | 21c2a0a75bec887413cddde46351b6d87469993f (patch) | |
| tree | 89ae6ba723dead742ac3304655017a2ed519bcf0 | |
| parent | bb415fd714323f36199a9bef890d885733f2e046 (diff) | |
Always enable KMS if server's new enough, and remove option.
The API should be stable at this point, and we don't want to allow mistakes.
(cherry picked from commit 934008a2cbcec0c790580750c672c0367a9e4c55)
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 0bb0f22b..91f9455f 100644 --- a/configure.ac +++ b/configure.ac @@ -75,11 +75,6 @@ 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) @@ -112,14 +107,6 @@ 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"]) - if test x$KMS != xno; then - dnl exaGetPixmapDriverPrivate required for DRM_MODE. - PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], - [DRM_MODE=yes], [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]) if test x$DRI = xauto; then @@ -233,6 +220,13 @@ if test "$DRI" = yes; then fi fi +dnl exaGetPixmapDriverPrivate required for DRM_MODE. +PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], + [DRM_MODE=yes], [DRM_MODE=no]) +if test "x$DRM_MODE" = xyes; then + AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) +fi + AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) if test "$VIDEO_DEBUG" = yes; then AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) |