xf86-video-intel: configure.ac
Chris Wilson
ickle at kemper.freedesktop.org
Sun Feb 10 02:55:30 PST 2013
configure.ac | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 71fbad64c5cfe6832a03815bece4c89d15253e1a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Feb 10 10:54:17 2013 +0000
configure: Fix typo in checking for libdrm_intel
The package name is libdrm_intel not libdrm_intel-1, an obvious
cut'n'paste error from testing for pixman-1.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index cdc1ac9..25b479a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,20 +215,23 @@ AC_ARG_ENABLE(uxa,
AS_HELP_STRING([--enable-uxa],
[Enable Unified Acceleration Architecture (UXA) [default=yes]]),
[UXA="$enableval"],
- [UXA=yes])
+ [UXA=auto])
AC_MSG_CHECKING([whether to include UXA support])
-AC_MSG_RESULT([$UXA])
-if ! pkg-config --exists 'libdrm_intel-1 >= 2.4.29'; then
- UXA=no
-fi
-if ! pkg-config --exists 'pixman-1 >= 0.24.0'; then
- UXA=no
+if test "x$UXA" = "xauto"; then
+ if ! pkg-config --exists 'libdrm_intel >= 2.4.29'; then
+ UXA=no
+ fi
+ if ! pkg-config --exists 'pixman-1 >= 0.24.0'; then
+ UXA=no
+ fi
fi
if test "x$UXA" != "xno"; then
AC_DEFINE(USE_UXA, 1, [Enable UXA support])
PKG_CHECK_MODULES(DRMINTEL, [libdrm_intel >= 2.4.29])
required_pixman_version=0.24
+ UXA=yes
fi
+AC_MSG_RESULT([$UXA])
AM_CONDITIONAL(UXA, test x$UXA != xno)
AC_MSG_CHECKING([whether to include GLAMOR support])
More information about the xorg-commit
mailing list