From: Vincent Bernat <vincent@bernat.im>
Date: Fri, 3 Oct 2014 20:32:35 +0000 (+0200)
Subject: build: allow use of older versions of json-c
X-Git-Tag: 0.7.11~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c80ee6f068fe5ab87803a4e28f4dcb07b37047d7;p=thirdparty%2Flldpd.git

build: allow use of older versions of json-c

json-c library was first just named json. When requesting compilation
with json-c, also check for this library.
---

diff --git a/m4/json-c.m4 b/m4/json-c.m4
index cfab01eb..4fa65faa 100644
--- a/m4/json-c.m4
+++ b/m4/json-c.m4
@@ -3,8 +3,9 @@
 #
 
 AC_DEFUN([lldp_CHECK_JSONC], [
-   PKG_CHECK_MODULES([JSONC], [json-c >= 0], [],
-      [AC_MSG_ERROR([*** unable to find json-c])])
+   PKG_CHECK_MODULES([JSONC], [json-c], [],
+      [PKG_CHECK_MODULES([JSONC], [json], [],
+        [AC_MSG_ERROR([*** unable to find json-c])])])
 
    AC_SUBST([JSONC_LIBS])
    AC_SUBST([JSONC_CFLAGS])
diff --git a/src/client/jsonc_writer.c b/src/client/jsonc_writer.c
index da780a37..db9de438 100644
--- a/src/client/jsonc_writer.c
+++ b/src/client/jsonc_writer.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <json-c/json.h>
+#include <json.h>
 #include <sys/queue.h>
 
 #include "writer.h"