[OpenWrt-Devel] [PATCH] procd: Use pkg-config to find json-c

[William Holland]

Sorry I missed your reply to Yousong Zhou's email addressing the 
#include <json.h> issue. So should it simple be the following?

diff --git a/plug/hotplug.c b/plug/hotplug.c
index 061833a..6df7971 100644
--- a/plug/hotplug.c
+++ b/plug/hotplug.c
@@ -22,7 +22,7 @@
  #include <libubox/blobmsg_json.h>
  #include <libubox/json_script.h>
  #include <libubox/uloop.h>
-#include <json/json.h>
+#include <json-c/json.h>

  #include <fcntl.h>
  #include <unistd.h>
diff --git a/service/validate.c b/service/validate.c
index a33a48e..bceddac 100644
--- a/service/validate.c
+++ b/service/validate.c
@@ -13,7 +13,7 @@

  #include <libubox/blobmsg_json.h>
  #include <libubox/avl-cmp.h>
-#include <json/json.h>
+#include <json-c/json.h>

  #include "../procd.h"

Thanks
Will


On 04/03/15 13:51, Karl Palsson wrote:
> Comments inline, I thought I'd made similar comments earlier, but
> perhaps I forgot...
>
> William Holland <william.holland at codethink.co.uk> wrote:
>> ---
>>   CMakeLists.txt     |    4 ++++
>>   plug/hotplug.c     |    2 +-
>>   service/validate.c |    2 +-
>>   3 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/CMakeLists.txt b/CMakeLists.txt
>> index 5414677..0296735 100644
>> --- a/CMakeLists.txt
>> +++ b/CMakeLists.txt
>> @@ -14,6 +14,10 @@ SET(SOURCES procd.c signal.c watchdog.c state.c	inittab.c rcS.c	ubus.c system.c
>>   	service/service.c service/instance.c service/validate.c service/trigger.c service/watch.c
>>   	plug/coldplug.c plug/hotplug.c utils/utils.c)
>>   
>> +INCLUDE(FindPkgConfig)
>> +PKG_CHECK_MODULES(JSONC json-c json)
>> +INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
>> +
>>   find_library(json NAMES json-c json)
> procd is only used in openwrt in releases that came after the json-c
> library moved to version 0.11.  There's no need for this backward
> compatibility in "new code"
>
>
>>   SET(LIBS ubox ubus ${json} blobmsg_json json_script)
>>   
>> diff --git a/plug/hotplug.c b/plug/hotplug.c
>> index 061833a..aa0e070 100644
>> --- a/plug/hotplug.c
>> +++ b/plug/hotplug.c
>> @@ -22,7 +22,7 @@
>>   #include <libubox/blobmsg_json.h>
>>   #include <libubox/json_script.h>
>>   #include <libubox/uloop.h>
>> -#include <json/json.h>
>> +#include <json.h>
> Why not <json-c/json.h> ? The package makefile for libjson-c installs
> into the json-c directory.  Why do you need this?  Why would you want to
> be different to other platforms?
>
>>   
>>   #include <fcntl.h>
>>   #include <unistd.h>
>> diff --git a/service/validate.c b/service/validate.c
>> index a33a48e..cedd1ed 100644
>> --- a/service/validate.c
>> +++ b/service/validate.c
>> @@ -13,7 +13,7 @@
>>   
>>   #include <libubox/blobmsg_json.h>
>>   #include <libubox/avl-cmp.h>
>> -#include <json/json.h>
>> +#include <json.h>
> Same....
>
>>   
>>   #include "../procd.h"
>>   
>> -- 
>> 1.7.10.4
>> _______________________________________________
>> openwrt-devel mailing list
>> openwrt-devel at lists.openwrt.org
>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel