xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Thu Apr 12 21:35:12 UTC 2018
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d7269b49c3408f93a6cb8e28ddc3dda88224620a
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Wed Apr 11 18:51:16 2018 +0100
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 <ajax at redhat.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
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'),
More information about the xorg-commit
mailing list