From 11a759c33160db6e887e7640071ba84482e6164f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 17 Nov 2016 15:36:54 -0300 Subject: [PATCH] configure.ac: invert order for wayland-scanner check When cross-compiling the .pc file might point to the wrong wayland-scanner binary (target rather than host) resulting in a non-executable and wrong scanner. Try searching the PATH first, and if that fails fall back into pkg-config. [Vincent: tweak patch for 17.1.1 version] Signed-off-by: Gustavo Zacarias Signed-off-by: Vicente Olivert Riera [Romain: rebase on 17.3.1] Signed-off-by: Romain Naour --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ee03d6f582..786b7214b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1695,11 +1695,11 @@ 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='') +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) if test "x$WAYLAND_SCANNER" = x; then - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) + PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, + WAYLAND_SCANNER='') fi PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) -- 2.14.3