Re: [Xen-devel] [PATCH] libxl: add support for yajl 2.x

[Roger Pau Monnà <roger.pau@xxxxxxxxxxxxx>]

2011/12/22 Ian Campbell <Ian.Campbell@xxxxxxxxxx>:
> On Tue, 2011-12-20 at 09:53 +0000, Roger Pau Monne wrote:
>> iff -r f72b99fccfca -r f4ff3ce53fd2 tools/check/check_yajl_lib
>> --- a/tools/check/check_yajl_lib    ÂTue Dec 20 08:31:40 2011 +0100
>> +++ b/tools/check/check_yajl_lib    ÂTue Dec 20 10:53:16 2011 +0100
>> @@ -3,4 +3,4 @@
>>
>> Â. ./funcs.sh
>>
>> -has_lib libyajl.so.1 || fail "can't find libyajl.so.1 version 1"
>> +has_lib libyajl.so.1 || has_lib libyajl.so.2 || fail "can't find
>> libyajl.so.1 version 1 or libyajl.so.2 version 2"
>
> The purpose of specifically checking for .so.1 was to avoid trying to
> use v2. Since you've fixed this you can just make it check for
> libyajl.so.
>
>
>> diff -r f72b99fccfca -r f4ff3ce53fd2 tools/libxl/libxl_json.h
>> --- a/tools/libxl/libxl_json.h ÂTue Dec 20 08:31:40 2011 +0100
>> +++ b/tools/libxl/libxl_json.h ÂTue Dec 20 10:53:16 2011 +0100
>> @@ -16,8 +16,14 @@
>> Â#define LIBXL_JSON_H
>>
>> Â#include <yajl/yajl_gen.h>
>> +#include <yajl/yajl_version.h>
>
> Sadly this isn't in the version of libyajl in Debian Stable which is
> 1.0.8-1. :-(

This is what I was afraid of, older versions of yajl doesn't have
yajl_version.h. So now I will have to check if yajl_version.h is
present to include it. Will try to put an updated patch today.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel