From: Matt Turner <mattst88@gmail.com>
Date: Wed, 8 Mar 2017 05:24:00 +0000 (-0800)
Subject: Revert "configure.ac: Use PKG_CHECK_VAR for wayland-scanner."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58b69eedd3bd3d9032a36fbc8ced8b187025aeb2;p=mesa.git

Revert "configure.ac: Use PKG_CHECK_VAR for wayland-scanner."

This reverts commit 8a26e944399ae4d0fd662e5106f0b34f5ced462d.
---

diff --git a/configure.ac b/configure.ac
index 8fbadc80e64..d64ed2d3e8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2102,7 +2102,12 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
     AC_MSG_ERROR([cannot build egl state tracker without EGL library])
 fi
 
-PKG_CHECK_VAR([WAYLAND_SCANNER], [wayland-scanner], [wayland_scanner])
+PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+        WAYLAND_SCANNER='')
+if test "x$WAYLAND_SCANNER" = x; then
+    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+fi
 
 # Do per-EGL platform setups and checks
 egl_platforms=`IFS=', '; echo $with_egl_platforms`