| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame^] | 1 | From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Wed, 11 May 2016 16:16:30 +0300 |
| 4 | Subject: [PATCH] configure.ac: Fix wayland-protocols path |
| 5 | |
| 6 | The wayland-protocols directory is used during build: Fix the path |
| 7 | to point to sysroot specified in recipe. |
| 8 | |
| 9 | Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that |
| 10 | breaks multilib weston as it would point to multilib sysroot when the |
| 11 | (allarch) wayland-protocols is actually in the machine sysroot. |
| 12 | |
| 13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 14 | Upstream-Status: Inappropriate [embedded specific] |
| 15 | --- |
| 16 | configure.ac | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index bc7c329..15a05d3 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) |
| 24 | PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) |
| 25 | |
| 26 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], |
| 27 | - [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) |
| 28 | + [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) |
| 29 | AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) |
| 30 | |
| 31 | AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, |
| 32 | -- |
| 33 | 2.1.4 |
| 34 | |