Mesa (master): configure.ac: Use PKG_CHECK_VAR for wayland-scanner.
Matt Turner
mattst88 at kemper.freedesktop.org
Tue Mar 7 15:27:56 UTC 2017
Module: Mesa
Branch: master
Commit: 8a26e944399ae4d0fd662e5106f0b34f5ced462d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a26e944399ae4d0fd662e5106f0b34f5ced462d
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Mar 6 10:20:10 2017 -0800
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 at collabora.com>
---
configure.ac | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 49cb283..7a89344 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`
More information about the mesa-commit
mailing list