Mesa (17.1): configure.ac: manually expand PKG_CHECK_VAR

Emil Velikov evelikov at kemper.freedesktop.org
Mon Apr 24 14:32:51 UTC 2017


Module: Mesa
Branch: 17.1
Commit: 3d40db7892d314b78353e2ee28912873c17ca844
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d40db7892d314b78353e2ee28912873c17ca844

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Apr 18 11:33:42 2017 +0100

configure.ac: manually expand PKG_CHECK_VAR

The macro is introduced with pkgconfig v0.28 which isn't universally
available. Thus it will error at configure stage.

Reported-by: Brian Paul <brianp at vmware.com>
Tested-by: Brian Paul <brianp at vmware.com>
Fixes: ce562f9e3fa ("EGL: Implement the libglvnd interface for EGL (v3)")
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
(cherry picked from commit 179e21a72045ceb09cebf4c426bae16580fdd438)

---

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e18f12f0b9..e1c60d842b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1367,7 +1367,7 @@ if test "x$enable_libglvnd" = xyes ; then
     esac
 
     PKG_CHECK_MODULES([GLVND], libglvnd >= 0.2.0)
-    PKG_CHECK_VAR(LIBGLVND_DATADIR, libglvnd, datadir)
+    LIBGLVND_DATADIR=`$PKG_CONFIG --variable=datadir libglvnd`
     AC_SUBST([LIBGLVND_DATADIR])
 
     DEFINES="${DEFINES} -DUSE_LIBGLVND=1"




More information about the mesa-commit mailing list