[PATCH] build: fix commit that changed option for installing client

[Kristian Høgsberg]

On Thu, Jan 02, 2014 at 08:30:57PM +0000, Ricardo Marcelino Vieira wrote:
> From: Ricardo Vieira <ricardo.vieira at tecnico.ulisboa.pt>
> 
> Without this patch the option --enable-demo-clients-install does not
> install the client demos.

Thanks.  I had to apply by hand because of email whitespace
damage... you should only send git patches using git send-email,
everything else typically messes it up.

> ---
>  configure.ac | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0191941..b106882 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -461,9 +461,9 @@ AC_DEFINE_UNQUOTED([WESTON_SHELL_CLIENT],
> ["$WESTON_SHELL_CLIENT"],
> 
>  AC_ARG_ENABLE(demo-clients-install,
>                AS_HELP_STRING([--enable-demo-clients-install],
> -                             [Install demo clients built with
> weston]),,
> -              install_demo_clients=no)
> -AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "install_demo_clients" =
> "xyes"])
> +                             [Install demo clients built with
> weston]),install_demo_clients=yes,

The middle part here gets run if the argument is given, whether you
pass --enable or --disable.  By default autoconf will set the
enable_demo_clients_install variable to yes or no accordingly, which
just works.  Setting the variable to yes here always enable
installing, even if you pass --disable.

Kristian

> +              enable_demo_clients_install=no)
> +AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test
> "x$enable_demo_clients_install" = "xyes"])
> 
>  PKG_CHECK_MODULES(LCMS, lcms2,
>                    [have_lcms=yes], [have_lcms=no])
> @@ -534,7 +534,7 @@ AC_MSG_RESULT([
>  	Build Simple Clients		${enable_simple_clients}
>  	Build Simple EGL Clients	${enable_simple_egl_clients}
> 
> -	Install Demo Clients		${install_demo_clients}
> +	Install Demo Clients		${enable_demo_clients_install}
> 
>  	Colord Support			${have_colord}
>  	GLU Support			${have_glu}
> -- 
> 1.8.5.2