From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 4 Jun 2016 23:55:22 +0000 (-0400)
Subject: configure: Auto pick-up the correct json env
X-Git-Tag: frr-2.0-rc1~547
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=112072ac877944c86c0a86ae9e575eda034e39c1;p=mirror%2Ffrr.git

configure: Auto pick-up the correct json env

Fix the code to allow Quagga to automatically
compile with the correct json library.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/configure.ac b/configure.ac
index d9f67def40..713cf40801 100755
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,6 @@ dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow
 AC_SUBST(pkgsrcdir)
 AC_SUBST(pkgsrcrcdir)
 
-LIBS="$LIBS -L/usr/include/json/ -ljson-c"
-
 dnl ------------
 dnl Check CFLAGS
 dnl ------------
@@ -323,6 +321,12 @@ AC_ARG_ENABLE(werror,
 AC_ARG_ENABLE(cumulus,
   AS_HELP_STRING([--enable-cumulus], [enable Cumulus Switch Special Extensions]))
 
+AC_CHECK_HEADERS(json-c/json.h)
+AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c")
+if test $ac_cv_lib_json_c_json_object_get = no; then
+  AC_MSG_ERROR([lib json is needed to compile])
+fi
+
 if test x"${enable_gcc_rdynamic}" != x"no" ; then
   if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then
     LDFLAGS="${LDFLAGS} -rdynamic"
diff --git a/lib/json.h b/lib/json.h
index e69b10acd2..561f7cc405 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -22,7 +22,11 @@
 #ifndef _QUAGGA_JSON_H
 #define _QUAGGA_JSON_H
 
+#if defined(HAVE_JSON_C_JSON_H)
+#include <json-c/json.h>
+#else
 #include <json/json.h>
+#endif
 
 extern int use_json(const int argc, const char *argv[]);
 extern void json_object_string_add(struct json_object* obj, const char *key,