From d7269b49c3408f93a6cb8e28ddc3dda88224620a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 11 Apr 2018 18:51:16 +0100 Subject: [PATCH] configure.ac: make use of wayland-scanner.pc Replace the current (incorrect) assumption that wayland-scanner is located in the wayland-client prefix. Make use of the wayland_scanner variable in wayland-scanner.pc It was introduced back in 2013 and we already require newer wayland bits Reviewed-by: Adam Jackson Signed-off-by: Emil Velikov --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 72dd59a62..aa361d9a9 100644 --- a/configure.ac +++ b/configure.ac @@ -2387,9 +2387,11 @@ if test "x$XWAYLAND" = xyes; then AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) fi - WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, - [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + if test "x$WAYLAND_SCANNER" = x; then + PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) + AC_SUBST(WAYLAND_SCANNER, `$PKG_CONFIG --variable=wayland_scanner wayland-scanner`) + fi PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner >= 1.14.91], AC_SUBST(SCANNER_ARG, 'private-code'),