Skip to content

Commit

Permalink
configure: make it possible to override wayland-scanner
Browse files Browse the repository at this point in the history
When cross-compiling, PKG_CONFIG might pick up the wayland-scanner
from the sysroot.
  • Loading branch information
Yann Lochet authored and jbkempf committed Dec 1, 2022
1 parent 2955528 commit 75e52f6
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3437,10 +3437,12 @@ AS_IF([test "${enable_wayland}" != "no"], [
PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl],, [
wl_err="$wl_err ${WAYLAND_EGL_PKG_ERRORS}."
])
PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.15], [
WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
], [
wl_err="$wl_err ${WAYLAND_SCANNER_PKG_ERRORS}."
AS_VAR_SET_IF(WAYLAND_SCANNER, [],[
PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.15], [
WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
], [
wl_err="$wl_err ${WAYLAND_SCANNER_PKG_ERRORS}."
])
])
dnl wayland-protocols
Expand Down

0 comments on commit 75e52f6

Please sign in to comment.