[Mesa-dev] [PATCH 02/17] configure.ac: provide a fall-back define for WAYLAND_SCANNER

Emil Velikov emil.l.velikov at gmail.com
Wed Mar 8 17:15:53 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

In some cases, we can end up calling WAYLAND_SCANNER even when
there's no binary. Do follow the approach set by AX_PROG_FLEX/BISON and
set the variable to ':'

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d64ed2d3e8..19a9cdd007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2106,7 +2106,7 @@ 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])
+    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
 fi
 
 # Do per-EGL platform setups and checks
@@ -2117,7 +2117,7 @@ for plat in $egl_platforms; do
 
 		PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED])
 
-		if test "x$WAYLAND_SCANNER" = x; then
+		if test "x$WAYLAND_SCANNER" = "x:"; then
 			AC_MSG_ERROR([wayland-scanner is needed to compile the wayland egl platform])
 		fi
 		;;
-- 
2.11.1



More information about the mesa-dev mailing list