Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 |
| 4 | Subject: [PATCH] Simplify wayland-scanner lookup |
| 5 | |
| 6 | Don't use pkg-config to lookup the path of a binary that's in the path. |
| 7 | |
| 8 | Alternatively we'd have to prefix the path returned by pkg-config with |
| 9 | PKG_CONFIG_SYSROOT_DIR. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 13 | --- |
| 14 | configure.ac | 7 +------ |
| 15 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 16 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 17 | Index: mesa-17.3.6/configure.ac |
| 18 | =================================================================== |
| 19 | --- mesa-17.3.6.orig/configure.ac |
| 20 | +++ mesa-17.3.6/configure.ac |
| 21 | @@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then |
| 22 | with_platforms=$with_egl_platforms |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 | -if test "x$WAYLAND_SCANNER" = x; then |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 29 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 30 | -fi |
| 31 | +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) |
| 32 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 33 | PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) |
| 34 | if test "x$have_wayland_protocols" = xyes; then |