diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-10 10:54:17 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-10 10:54:17 +0000 |
commit | 71fbad64c5cfe6832a03815bece4c89d15253e1a (patch) | |
tree | 8bf9f4c34534c92f6b160ad82ae43d7bb7d389c3 /configure.ac | |
parent | 3cbdfb54d1fcfed7745111e861e19b7bbac243cc (diff) |
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@chris-wilson.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index cdc1ac9e..25b479a8 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]) |