diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-24 18:22:20 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-26 14:20:42 -0800 |
| commit | 22dc9a5580d77cc4707bfb8e19474e611a06ae9a (patch) | |
| tree | 91a60fbcc1fba6b315549c7b112728320c5f30ec /configure.ac | |
| parent | cb1f7ec0876746c1b52b63cdb508544e9e4e32e3 (diff) | |
Fix UXA for server 1.4.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index a6ced676..3f6f1b82 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,13 @@ 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]) + +PKG_CHECK_MODULES(SERVER_1_5, [xorg-server >= 1.5], + [SERVER_1_5=yes], [SERVER_1_5=no]) + +if test "$SERVER_1_5" = yes; then + AC_DEFINE(SERVER_1_5, 1, [Building against server 1.5]) +fi sdkdir=$(pkg-config --variable=sdkdir xorg-server) drm_cflags=$(pkg-config --cflags libdrm) @@ -118,11 +124,6 @@ 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], @@ -182,8 +183,6 @@ else fi AC_SUBST([XMODES_CFLAGS]) -UXA_CFLAGS='-I$(top_srcdir)/uxa' -AC_SUBST([UXA_CFLAGS]) SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" @@ -215,9 +214,9 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi -dnl exaGetPixmapDriverPrivate required for DRM_MODE. +dnl Server 1.5's set_mode_major required for DRM_MODE. PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], - [DRM_MODE=yes], [DRM_MODE=no]) + [DRM_MODE=yes], [DRM_MODE=no]) if test "x$DRM_MODE" = xyes; then AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) fi |