matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

configure: Auto pick-up the correct json env

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

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

Conflicts:
	configure.ac
This commit is contained in:
Donald Sharp 2016-06-04 19:55:22 -04:00
parent 97da92655c
commit c2f4c19cdc
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -49,8 +49,6 @@ dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow
AC_SUBST(pkgsrcdir) AC_SUBST(pkgsrcdir)
AC_SUBST(pkgsrcrcdir) AC_SUBST(pkgsrcrcdir)
LIBS="$LIBS -L/usr/include/json/ -ljson"
dnl ------------ dnl ------------
dnl Check CFLAGS dnl Check CFLAGS
dnl ------------ dnl ------------
@ -314,6 +312,12 @@ if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
CFLAGS="${CFLAGS} -Wpacked -Wpadded" CFLAGS="${CFLAGS} -Wpacked -Wpadded"
fi fi
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"no" ; then
if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then
LDFLAGS="${LDFLAGS} -rdynamic" LDFLAGS="${LDFLAGS} -rdynamic"

4
lib/json.h
View file

@ -22,7 +22,11 @@
#ifndef _QUAGGA_JSON_H #ifndef _QUAGGA_JSON_H
#define _QUAGGA_JSON_H #define _QUAGGA_JSON_H
#if defined(HAVE_JSON_C_JSON_H)
#include <json-c/json.h>
#else
#include <json/json.h> #include <json/json.h>
#endif
extern int use_json(const int argc, const char *argv[]); extern int use_json(const int argc, const char *argv[]);
extern void json_object_string_add(struct json_object* obj, const char *key, extern void json_object_string_add(struct json_object* obj, const char *key,