| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 |
| 4 | Subject: [PATCH 1/6] Simplify wayland-scanner lookup |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | Don't use pkg-config to lookup the path of a binary that's in the path. |
| 8 | |
| 9 | Alternatively we'd have to prefix the path returned by pkg-config with |
| 10 | PKG_CONFIG_SYSROOT_DIR. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| 15 | --- |
| 16 | configure.ac | 7 +------ |
| 17 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index 14f1af2b2f..916d0bd207 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -1825,12 +1825,7 @@ for plat in $platforms; do |
| 24 | PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) |
| 25 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` |
| 26 | |
| 27 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], |
| 28 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, |
| 29 | - WAYLAND_SCANNER='') |
| 30 | - if test "x$WAYLAND_SCANNER" = x; then |
| 31 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
| 32 | - fi |
| 33 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) |
| 34 | |
| 35 | if test "x$WAYLAND_SCANNER" = "x:"; then |
| 36 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) |
| 37 | -- |
| 38 | 2.18.0 |
| 39 | |