Commit af28f790 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/weston: fix configure.ac to check for wayland-scanner 



configure whines while checking for wayland-scanner.

wayland-scanner is used to generate the protocol parser C files from
the protocol definition XML files.

weston has a hard-dependency on wayland-scanner, so it can regenerate
its shell/mouse/keyboard/... "handlers".

Since we're using a tarball, those protocol files are already generated
and up-to-date, but the check is hard-coded and unconditional. If
wayland-scanner is missing, configure fails.

We could well patch away this check, but we'd have to carry and maintain
it probably for ever.

Better to fix it: add a patch from upstream weston to fix configure
whining.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent efee2e4e

package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
commit 9f43cb48aac9d27aa49fe955104f5cfd204703ed

Author: Quentin Glidic <sardemff7+git@sardemff7.net>

Date:   Sat Aug 24 20:36:10 2013 +0200



    autotools: Fix AC_PATH_PROG call

    

    Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

    Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>



diff --git a/configure.ac b/configure.ac

index 0129157..43e5e5c 100644

--- a/configure.ac

+++ b/configure.ac

@@ -424,8 +424,10 @@ if test "x$have_lcms" = xyes; then

 fi

 AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])

 

-AC_PATH_PROG([wayland_scanner], [wayland-scanner],

-	     [AC_MSG_ERROR("wayland-scanner is needed to compile weston")])

+AC_PATH_PROG([wayland_scanner], [wayland-scanner])

+if test x$wayland_scanner = x; then

+	AC_MSG_ERROR([wayland-scanner is needed to compile weston])

+fi

 

 AC_CONFIG_FILES([Makefile

 		 shared/Makefile

package/weston/weston.mk

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ WESTON_LICENSE_FILES = COPYING 


WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \

	jpeg mtdev udev cairo



# We touch configure.ac with one of our patches

WESTON_AUTORECONF = YES



WESTON_CONF_OPT = \

	--disable-egl \

	--disable-simple-egl-clients \