summaryrefslogtreecommitdiff
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-12 21:16:27 (GMT)
committer Chris Wilson <chris@chris-wilson.co.uk>2012-07-12 21:16:55 (GMT)
commitb5d6a57f12025aef9850c7d9baa6905f776be971 (patch) (side-by-side diff)
tree3b476b420d2a6af0d34f48f2472ceda24098df03
parent6c2975ab2943478b3a246b5fb231f9f3df2d8475 (diff)
downloadxf86-video-intel-b5d6a57f12025aef9850c7d9baa6905f776be971.zip
xf86-video-intel-b5d6a57f12025aef9850c7d9baa6905f776be971.tar.gz
Enable compilation of SNA by default
But only if we meet the required versions of Xorg and leave UXA as the default AccelMethod for the time being. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 128a30c..d323da7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,13 +120,17 @@ required_pixman_version=0.24
AC_ARG_ENABLE(sna,
AS_HELP_STRING([--enable-sna],
- [Enable SandyBridge's New Acceleration (SNA) [default=no]]),
+ [Enable SandyBridge's New Acceleration (SNA) [default=auto]]),
[SNA="$enableval"],
- [SNA=no])
+ [SNA=auto])
+
+AC_CHECK_HEADERS([sys/sysinfo.h], , SNA=no)
+if test "x$SNA" = "xauto" && pkg-config --exists "xorg-server >= 1.10"; then
+ SNA=yes
+fi
if test "x$SNA" != "xno"; then
required_xorg_xserver_version=1.10
AC_DEFINE(USE_SNA, 1, [Enable SNA support])
- AC_CHECK_HEADERS([sys/sysinfo.h])
fi
AC_MSG_CHECKING([whether to include SNA support])
AM_CONDITIONAL(SNA, test x$SNA != xno)