blob: 0212922c5d51dfb80f5052da0d1c4d7a5e9835e2 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 29 Aug 2018 22:10:30 -0300
4Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
5Organization: O.S. Systems Software LTDA.
6
7This allows to override the wayland-protocols pkgdatadir with the
8WAYLAND_PROTOCOLS_DATADIR from environment.
9
10pkgconfig would return an absolute path in
11/usr/share/wayland-protocols
12for the pkgdatadir value, which is not suitable for cross-compiling.
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Upstream-Status: Pending
16
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index 40cac36ac2..728bbdcbc4 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -1823,7 +1823,7 @@ for plat in $platforms; do
27 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
28 PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
29 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
30- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
31+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
32
33 AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34
35--
362.18.0
37