diff options
| author | Eric Anholt <eric@anholt.net> | 2008-10-06 17:00:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-10-06 17:26:43 -0700 |
| commit | 3a4151b69daa478ac6edf042d604ee41e8429c0d (patch) | |
| tree | fff1ba0ece972c7b593a01ae7f3bc9681d63aae5 /configure.ac | |
| parent | 3621183cf4acef23414e8d69c34b1e587f52ec67 (diff) | |
Fix driver build against server 1.4.2.
This disables UXA and DRM modesetting pre-1.5, due to privates handling
issues.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 86bb80fd..d5db3a94 100644 --- a/configure.ac +++ b/configure.ac @@ -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], |