From: Matt Turner <mattst88@gmail.com>
Date: Mon, 6 Mar 2017 18:42:30 +0000 (-0800)
Subject: configure.ac: Ensure libva is enabled before invoking pkg-config.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86c023f973526adc27c62d261a23e5b53a1f359f;p=mesa.git

configure.ac: Ensure libva is enabled before invoking pkg-config.

PKG_CHECK_VAR can only check --variable=$NAME, so it cannot handle
modversion.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/configure.ac b/configure.ac
index e4901956a91..bc85d3ca6af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2537,8 +2537,10 @@ AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_TINY")
 AC_SUBST([VDPAU_MAJOR], 1)
 AC_SUBST([VDPAU_MINOR], 0)
 
-VA_MAJOR=`$PKG_CONFIG --modversion libva | $SED -n 's/\([[^\.]]*\)\..*$/\1/p'`
-VA_MINOR=`$PKG_CONFIG --modversion libva | $SED -n 's/.*\.\(.*\)\..*$/\1/p'`
+if test "x$enable_va" = xyes; then
+    VA_MAJOR=`$PKG_CONFIG --modversion libva | $SED -n 's/\([[^\.]]*\)\..*$/\1/p'`
+    VA_MINOR=`$PKG_CONFIG --modversion libva | $SED -n 's/.*\.\(.*\)\..*$/\1/p'`
+fi
 AC_SUBST([VA_MAJOR], $VA_MAJOR)
 AC_SUBST([VA_MINOR], $VA_MINOR)