This reverts commit 61d6ff3ba3c0a21239641f4d5fe8d4fa9c864325.
We need to unconditionally check for wayland-scanner, so make
dist/distcheck is not broken.
CC: Daniel Stone <dani...@collabora.com>
---
configure.ac | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index d1c8bb82dae..15f315ce93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1784,6 +1784,13 @@ if test "x$with_platforms" = xauto; then
with_platforms=$with_egl_platforms
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
+
# Do per platform setups and checks
platforms=`IFS=', '; echo $with_platforms`
for plat in $platforms; do
@@ -1795,13 +1802,6 @@ for plat in $platforms; do
PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED])
WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
- 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
-
if test "x$WAYLAND_SCANNER" = "x:"; then
AC_MSG_ERROR([wayland-scanner is needed to compile the wayland
platform])
fi
--
2.14.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
