Module: Mesa Branch: master Commit: 58b69eedd3bd3d9032a36fbc8ced8b187025aeb2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=58b69eedd3bd3d9032a36fbc8ced8b187025aeb2
Author: Matt Turner <[email protected]> Date: Tue Mar 7 21:24:00 2017 -0800 Revert "configure.ac: Use PKG_CHECK_VAR for wayland-scanner." This reverts commit 8a26e944399ae4d0fd662e5106f0b34f5ced462d. --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8fbadc8..d64ed2d 100644 --- a/configure.ac +++ b/configure.ac @@ -2102,7 +2102,12 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then AC_MSG_ERROR([cannot build egl state tracker without EGL library]) fi -PKG_CHECK_VAR([WAYLAND_SCANNER], [wayland-scanner], [wayland_scanner]) +PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, + WAYLAND_SCANNER='') +if test "x$WAYLAND_SCANNER" = x; then + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +fi # Do per-EGL platform setups and checks egl_platforms=`IFS=', '; echo $with_egl_platforms` _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
