From 7293ce43daaefbba024f80c15e2eb5cf4e9b9bd3 Mon Sep 17 00:00:00 2001
From: Andreas Schultz <aschultz@tpip.net>
Date: Mon, 14 Mar 2016 11:47:43 +0100
Subject: [PATCH] [ac] drop old libjson compatibility

json-c >= 0.11 is required now
---
 configure.ac              | 13 ++++---------
 src/ac/ac.h               |  2 +-
 src/ac/ac_dfa_configure.c |  2 +-
 src/ac/ac_dfa_datacheck.c |  2 +-
 src/ac/ac_dfa_join.c      |  2 +-
 src/ac/ac_json.h          |  2 +-
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 378659d..481fab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,15 +183,10 @@ if test "${enable_ac}" = "yes"; then
 	test "x${have_wolfssl_ssl}" != "xyes" && AC_MSG_ERROR(You need the wolfssl library)
 
 	PKG_CHECK_MODULES(
-		[LIBJSON], 
-		[json-c >= 0.11], 
-		[], 
-		[PKG_CHECK_MODULES(
-			[LIBJSON],
-			[json >= 0.9],
-			[],
-			[AC_MSG_ERROR(You need the libjson)]
-		)]
+		[LIBJSON],
+		[json-c >= 0.11],
+		[],
+		[AC_MSG_ERROR(You need the libjson)]
 	)
 
 	# Check XML2 library
diff --git a/src/ac/ac.h b/src/ac/ac.h
index f66a689..032111f 100644
--- a/src/ac/ac.h
+++ b/src/ac/ac.h
@@ -14,7 +14,7 @@
 
 #include <pthread.h>
 #include <linux/if_ether.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 #include <ac_kmod.h>
 
diff --git a/src/ac/ac_dfa_configure.c b/src/ac/ac_dfa_configure.c
index f9ec479..47163bf 100644
--- a/src/ac/ac_dfa_configure.c
+++ b/src/ac/ac_dfa_configure.c
@@ -4,7 +4,7 @@
 #include "ac_session.h"
 #include "ac_json.h"
 #include "ac_wlans.h"
-#include <json/json.h>
+#include <json-c/json.h>
 #include <arpa/inet.h>
 
 /* */
diff --git a/src/ac/ac_dfa_datacheck.c b/src/ac/ac_dfa_datacheck.c
index c122bd4..0d8a21b 100644
--- a/src/ac/ac_dfa_datacheck.c
+++ b/src/ac/ac_dfa_datacheck.c
@@ -3,7 +3,7 @@
 #include "capwap_array.h"
 #include "ac_session.h"
 #include "ac_json.h"
-#include <json/json.h>
+#include <json-c/json.h>
 
 /* */
 static struct ac_soap_response* ac_dfa_state_datacheck_parsing_request(struct ac_session_t* session, struct capwap_parsed_packet* packet) {
diff --git a/src/ac/ac_dfa_join.c b/src/ac/ac_dfa_join.c
index a993373..40ed2c1 100644
--- a/src/ac/ac_dfa_join.c
+++ b/src/ac/ac_dfa_join.c
@@ -4,7 +4,7 @@
 #include "ac_session.h"
 #include "ac_backend.h"
 #include "ac_json.h"
-#include <json/json.h>
+#include <json-c/json.h>
 #include <arpa/inet.h>
 
 /* */
diff --git a/src/ac/ac_json.h b/src/ac/ac_json.h
index 7df701f..bfc3a33 100644
--- a/src/ac/ac_json.h
+++ b/src/ac/ac_json.h
@@ -2,7 +2,7 @@
 #define __AC_JSON_HEADER__
 
 #include "capwap_array.h"
-#include <json/json.h>
+#include <json-c/json.h>
 
 #define IEEE80211_BINDING_JSON_ROOT					"WTPRadio"