blob: d065e2285c67b6f183d0ab4190272f5261fc6c31 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 20 Feb 2019 16:17:00 -0300
4Subject: [PATCH 1/4] Simplify wayland-scanner lookup
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08005Organization: O.S. Systems Software LTDA.
6
7Don't use pkg-config to lookup the path of a binary that's in the path.
8
9Alternatively we'd have to prefix the path returned by pkg-config with
10PKG_CONFIG_SYSROOT_DIR.
11
12Upstream-Status: Pending
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop19323692019-04-05 15:28:33 -040015Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016---
17 configure.ac | 7 +------
18 1 file changed, 1 insertion(+), 6 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040021index 1ef68fe68e6..1816a4cd475 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022--- a/configure.ac
23+++ b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040024@@ -1854,16 +1854,11 @@ for plat in $platforms; do
25 fi
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
27
28- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
29- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
30- WAYLAND_SCANNER='')
Brad Bishop19323692019-04-05 15:28:33 -040031 PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
32 AC_SUBST(SCANNER_ARG, 'private-code'),
33 AC_SUBST(SCANNER_ARG, 'code'))
34
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035- if test "x$WAYLAND_SCANNER" = x; then
36- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
37- fi
38+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
39
40 if test "x$WAYLAND_SCANNER" = "x:"; then
41 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
42--
Brad Bishop19323692019-04-05 15:28:33 -0400432.21.0
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080044