[Intel-gfx] [PATCH i-g-t 1/2] meson: don't assume xmlrpc-c-config is there

[Arkadiusz Hiler]

On Tue, Oct 24, 2017 at 11:14:14AM +0300, Jani Nikula wrote:
> xmlrpc is an optional dependency. If pkg-config can't find it, don't
> assume xmlrpc-c-config will be there either. Make xmlrpc-c-config
> optional too.
> 
> Fixes error:
> 
> Meson encountered an error in file meson.build, line 73, column 1:
> Program or command 'xmlrpc-c-config' not foundor not executable
> 
> Fixes: 892abc602a8a ("meson: Add fallback for xmlrpc discovery")
> Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Both patches are:

Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
and pushed. Thanks!


> ---
> 
> Note: Untested in the scenario described in 892abc602a8a ("meson: Add
> fallback for xmlrpc discovery")
> ---
>  meson.build | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index ac991c2f9bf2..fb81c4dbbd55 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -69,9 +69,10 @@ xmlrpc = dependency('xmlrpc', required : false)
>  xmlrpc_util = dependency('xmlrpc_util', required : false)
>  xmlrpc_client = dependency('xmlrpc_client', required : false)
>  
> -if not xmlrpc.found()
> -	libs_cmd = run_command('xmlrpc-c-config', 'client', '--libs')
> -	cflags_cmd = run_command('xmlrpc-c-config', 'client', '--cflags')
> +xmlrpc_cmd = find_program('xmlrpc-c-config', required : false)
> +if not xmlrpc.found() and xmlrpc_cmd.found()
> +	libs_cmd = run_command(xmlrpc_cmd, 'client', '--libs')
> +	cflags_cmd = run_command(xmlrpc_cmd, 'client', '--cflags')
>  
>  	if libs_cmd.returncode() == 0 and cflags_cmd.returncode() == 0
>  		xmlrpc = declare_dependency(compile_args: cflags_cmd.stdout().strip().split(),
> -- 
> 2.11.0
>