[PATCH 3/4] Link compositors to xkbcommon as well

[Kristian Høgsberg]

On Tue, May 01, 2012 at 08:37:11PM +0100, Daniel Stone wrote:
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>

I edited this one to just add xkbcommon to the COMPOSITOR pkg-config
check.  It's good practice to bundle as many pkgs into the pkg-config
call so we can inform the user of as many missing pgs upfront as
possible.

Kristian

> ---
>  configure.ac |   10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 6da7922..ea75588 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -124,6 +124,10 @@ fi
>  COMPOSITOR_LIBS="$COMPOSITOR_LIBS $IMAGE_LIBS"
>  COMPOSITOR_CFLAGS="$COMPOSITOR_CFLAGS $IMAGE_CFLAGS"
>  
> +PKG_CHECK_MODULES(XKBCOMMON, [xkbcommon])
> +COMPOSITOR_LIBS="$COMPOSITOR_LIBS $XKBCOMMON_LIBS"
> +COMPOSITOR_CFLAGS="$COMPOSITOR_CFLAGS $XKBCOMMON_CFLAGS"
> +
>  AC_ARG_ENABLE(simple-clients, [  --enable-simple-clients],, enable_simple_clients=yes)
>  AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test x$enable_simple_clients = xyes)
>  if test x$enable_simple_clients = xyes; then
> @@ -137,10 +141,10 @@ AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes)
>  if test x$enable_clients = xyes; then
>    AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients])
>  
> -  PKG_CHECK_MODULES(CLIENT, [wayland-client wayland-egl egl >= 7.10 cairo >= 1.10.0 xkbcommon])
> +  PKG_CHECK_MODULES(CLIENT, [wayland-client wayland-egl egl >= 7.10 cairo >= 1.10.0])
>  
> -  CLIENT_CFLAGS="$CLIENT_CFLAGS $IMAGE_CFLAGS"
> -  CLIENT_LIBS="$CLIENT_LIBS $IMAGE_LIBS"
> +  CLIENT_CFLAGS="$CLIENT_CFLAGS $IMAGE_CFLAGS $XKBCOMMON_CFLAGS"
> +  CLIENT_LIBS="$CLIENT_LIBS $IMAGE_LIBS $XKBCOMMON_LIBS"
>  
>    PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ],
>  			     [have_poppler=yes], [have_poppler=no])
> -- 
> 1.7.10
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel