summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-10-31 18:58:10 +0000
committerAndres Gomez <agomez@igalia.com>2017-11-21 18:16:45 +0200
commita3adb7389371bf7fbb3341139d959f3c73a241b1 (patch)
treeeb814d440ccf3c0d0a25e51fe9e1aec839fbd582
parentc7e12a3afc0e5fb16e6cb5c2888e7bf2e0addb6d (diff)
downloadmesa-a3adb7389371bf7fbb3341139d959f3c73a241b1.tar.gz
configure.ac: require xcb* for the omx/va/... when using x11 platform
Targets such as omx and va can work w/o anything X related. Mandate the xcb* dependencies only when the X11 platform is selected. Reported-by: Lukas Rusak <lorusak@gmail.com> Fixes: 63e11ac2b5c ("configure: error out if building VA w/o supported platform") Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Tested-by: Lukas Rusak <lorusak@gmail.com> (v1) (cherry picked from commit 85a017230cacd0661570421c8e5b0619e512d33d)
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 698d59a3a83..0b3fd9d1fc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2192,7 +2192,9 @@ if test "x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \
"x$enable_omx" = xyes -o \
"x$enable_va" = xyes; then
- PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
+ if echo $platforms | grep -q "x11"; then
+ PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
+ fi
need_gallium_vl_winsys=yes
fi
AM_CONDITIONAL(NEED_GALLIUM_VL_WINSYS, test "x$need_gallium_vl_winsys" = xyes)