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>
Conflicts:
	configure.ac

diff --git a/configure.ac b/configure.ac
index 5c9b2e552aa0f433b23a24fe6e8f759831534300..792cacd0c3445cc986716ebe6054a2eb00b8e9a3 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -326,13 +326,10 @@ AC_ARG_ENABLE(rr-semantics,
 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
-
-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])
+  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])
+  fi
 fi
 
 if test x"${enable_gcc_rdynamic}" != x"no" ; then