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 <emil.velikov@collabora.com>
This commit is contained in:
@@ -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])
|
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
|
PKG_CHECK_VAR([WAYLAND_SCANNER], [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
|
# Do per-EGL platform setups and checks
|
||||||
egl_platforms=`IFS=', '; echo $with_egl_platforms`
|
egl_platforms=`IFS=', '; echo $with_egl_platforms`
|
||||||
|
Reference in New Issue
Block a user