From 8a26e944399ae4d0fd662e5106f0b34f5ced462d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 6 Mar 2017 10:20:10 -0800 Subject: [PATCH] configure.ac: Use PKG_CHECK_VAR for wayland-scanner. Available since pkg-config-0.28 and pkgconf-0.8.10. The removal of the AC_PATH_PROG is intentional. Use pkg-config. Reviewed-by: Emil Velikov --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 49cb28338d5..7a89344bed7 100644 --- a/configure.ac +++ b/configure.ac @@ -2102,12 +2102,7 @@ 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_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 +PKG_CHECK_VAR([WAYLAND_SCANNER], [wayland-scanner], [wayland_scanner]) # Do per-EGL platform setups and checks egl_platforms=`IFS=', '; echo $with_egl_platforms` -- 2.30.2