diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-12-07 14:32:45 +0000 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-05-31 22:32:03 +0200 |
| commit | 637a5d58b04d5ec7c20f789e7734310d874042c0 (patch) | |
| tree | c608fa6c8ac979964eae67b89976e8a9cb6d7dcf | |
| parent | 1f88c3c0cbfa2f2811737c7cd5e4660f60779398 (diff) | |
configure: error out if building VA w/o supported platform
A bit pedantic patch to fool proof should someone start thinkering
without knowing what they do.
Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
(cherry picked from commit 63e11ac2b5c99fa351be5f61a035f72384609a1c)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1d2e6ac5cf0..2aae768ad5b 100644 --- a/configure.ac +++ b/configure.ac @@ -2062,6 +2062,12 @@ if test "x$enable_xa" = xyes; then fi AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes) +if echo $platforms | grep -q "x11\|drm\|wayland"; then + have_va_platform=yes +else + have_va_platform=no +fi + dnl dnl Gallium G3DVL configuration dnl @@ -2078,7 +2084,7 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=no]) fi - if test "x$enable_va" = xauto; then + if test "x$enable_va" = xauto -a "x$have_va_platform" = xyes; then PKG_CHECK_EXISTS([libva >= $LIBVA_REQUIRED], [enable_va=yes], [enable_va=no]) fi fi @@ -2121,6 +2127,9 @@ fi AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) if test "x$enable_va" = xyes; then + if test "x$have_va_platform" != xyes; then + AC_MSG_ERROR([VA requires at least one of the x11 drm or wayland platforms]) + fi PKG_CHECK_MODULES([VA], [libva >= $LIBVA_REQUIRED]) gallium_st="$gallium_st va" fi |