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 ca492402ab
commit 10b8ab2691
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -326,13 +326,10 @@ AC_ARG_ENABLE(rr-semantics,
AC_CHECK_HEADERS(json-c/json.h) AC_CHECK_HEADERS(json-c/json.h)
AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c") AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c")
if test $ac_cv_lib_json_c_json_object_get = no; then if test $ac_cv_lib_json_c_json_object_get = no; then
AC_CHECK_LIB(json, json_object_get, LIBS="$LIBS -ljson")
if test $ac_cv_lib_json_json_object_get = no; then
AC_MSG_ERROR([lib json is needed to compile]) AC_MSG_ERROR([lib json is needed to compile])
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 fi
if test x"${enable_gcc_rdynamic}" != x"no" ; then if test x"${enable_gcc_rdynamic}" != x"no" ; then