[PATCH weston] shared: fix build of libshared-cairo

Kristian Høgsberg hoegsberg at gmail.com
Tue Jun 4 20:19:44 PDT 2013


On Tue, Jun 04, 2013 at 06:47:39PM +0300, ppaalanen at gmail.com wrote:
> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> Another case of missing wayland-util.h, as we didn't pass any libwayland
> CFLAGS. This is triggerable on a system, where libwayland is installed
> in a custom prefix, and pixman, cairo, libpng, and webp are either
> not installed or are installed in the standard path.
> 
> CONPOSITOR_CFLAGS contains more than just the libwayland CFLAGS, though.

(fixed the commit message typo and double checked it's right in the patch)

Yeah, maybe we should add a WAYLAND_SERVER pkg-config check in
configure.  As long as we don't have to add COMPOSITOR_LIBS, it's
fine, so let's go with this for now.

Kristian

> Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> ---
>  shared/Makefile.am | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/shared/Makefile.am b/shared/Makefile.am
> index 323f838..6778b35 100644
> --- a/shared/Makefile.am
> +++ b/shared/Makefile.am
> @@ -11,6 +11,7 @@ libshared_la_SOURCES =				\
>  
>  libshared_cairo_la_CFLAGS =			\
>  	$(GCC_CFLAGS)				\
> +	$(COMPOSITOR_CFLAGS)			\
>  	$(PIXMAN_CFLAGS)			\
>  	$(CAIRO_CFLAGS)				\
>  	$(PNG_CFLAGS)				\
> -- 
> 1.8.1.5
> 


More information about the wayland-devel mailing list