diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
| commit | 282f51c3f0e5bc2cedd2f60f458ca2662290d471 (patch) | |
| tree | 3bd89c1d2effcc7b8e1b2b9c805244806b3546bc /configure.ac | |
| parent | 8a54e3be5c5057fe8e3c52c03401fdada7978c45 (diff) | |
| parent | 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4 (diff) | |
Merge commit 'origin/master' into HEAD
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 161005eb..0789e2a3 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.5.96.0, + 2.4.97.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) @@ -84,6 +84,8 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) drm_cflags=$(pkg-config --cflags libdrm) @@ -108,6 +110,8 @@ if test x$DRI != 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 @@ -124,6 +128,11 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) +AM_CONDITIONAL(BUILD_UXA, test $BUILD_UXA = yes) +if test "$BUILD_UXA" = yes; then + AC_DEFINE(I830_USE_UXA, 1, [UMA Acceleration Architecture support]) +fi + AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], |