Browse Source

netifd: fixes for json-c 0.12

Signed-off-by: John Crispin <blogic@openwrt.org>
John Crispin 9 years ago
parent
commit
45fd905c98
2 changed files with 2 additions and 3 deletions
  1. 1 2
      CMakeLists.txt
  2. 1 1
      handler.h

+ 1 - 2
CMakeLists.txt

@@ -18,9 +18,8 @@ SET(SOURCES
 	macvlan.c ubus.c vlandev.c wireless.c)
 
 
-find_library(json NAMES json-c json)
 SET(LIBS
-	ubox ubus uci ${json} blobmsg_json)
+	ubox ubus uci json-c blobmsg_json)
 
 IF (NOT DEFINED LIBNL_LIBS)
   FIND_LIBRARY(libnl NAMES libnl-3 libnl nl-3 nl)

+ 1 - 1
handler.h

@@ -15,7 +15,7 @@
 #define __NETIFD_HANDLER_H
 
 #include <libubox/blobmsg_json.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #include "config.h"
 
 typedef void (*script_dump_cb)(const char *script, const char *name, json_object *obj);