From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 15 Nov 2016 15:20:49 +0200 Subject: [PATCH] Simplify wayland-scanner lookup Don't use pkg-config to lookup the path of a binary that's in the path. Alternatively we'd have to prefix the path returned by pkg-config with PKG_CONFIG_SYSROOT_DIR. Upstream-Status: Pending Signed-off-by: Jussi Kukkonen --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) Index: mesa-17.3.6/configure.ac =================================================================== --- mesa-17.3.6.orig/configure.ac +++ mesa-17.3.6/configure.ac @@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then with_platforms=$with_egl_platforms fi -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 +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) if test "x$have_wayland_protocols" = xyes; then