package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch

   1 From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001
   2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
   3 Date: Thu, 17 Nov 2016 15:36:54 -0300
   4 Subject: [PATCH] configure.ac: invert order for wayland-scanner check
   5
   6 When cross-compiling the .pc file might point to the wrong
   7 wayland-scanner binary (target rather than host) resulting in a
   8 non-executable and wrong scanner.
   9 Try searching the PATH first, and if that fails fall back into
  10 pkg-config.
  11
  12 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  13 ---
  14  configure.ac | 8 ++++----
  15  1 file changed, 4 insertions(+), 4 deletions(-)
  16
  17 diff --git a/configure.ac b/configure.ac
  18 index 5f30ae8..461792e 100644
  19 --- a/configure.ac
  20 +++ b/configure.ac
  21 @@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
  22      AC_MSG_ERROR([cannot build egl state tracker without EGL library])
  23  fi
  24
  25 -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
  26 -        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
  27 -        WAYLAND_SCANNER='')
  28 +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
  29  if test "x$WAYLAND_SCANNER" = x; then
  30 -    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
  31 +    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
  32 +            WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
  33 +            WAYLAND_SCANNER='')
  34  fi
  35
  36  # Do per-EGL platform setups and checks
  37 --
  38 2.7.3
  39