@@ -151,6 +151,10 @@

    you don't. */

 #undef HAVE_DECL_CYGWIN_CONV_PATH

+/* Define to 1 if you have a deprecated version of the 'libjson' library

+   (-ljson). */

+#undef HAVE_DEPRECATED_JSON

+

 /* Define to 1 if you have the <dirent.h> header file. */

 #undef HAVE_DIRENT_H

@@ -17233,9 +17233,72 @@ $as_echo "$ac_cv_search_json_object_object_get_ex" >&6; }

 ac_res=$ac_cv_search_json_object_object_get_ex

 if test "$ac_res" != no; then :

   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-  have_json="yes"

+

+have_json="yes"

+have_deprecated_json="no"

+else

+

+have_json="no"

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5

+$as_echo_n "checking for library containing json_object_object_get... " >&6; }

+if ${ac_cv_search_json_object_object_get+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

-  have_json="no"

+  ac_func_search_save_LIBS=$LIBS

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char json_object_object_get ();

+int

+main ()

+{

+return json_object_object_get ();

+  ;

+  return 0;

+}

+_ACEOF

+for ac_lib in '' json-c json; do

+  if test -z "$ac_lib"; then

+    ac_res="none required"

+  else

+    ac_res=-l$ac_lib

+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"

+  fi

+  if ac_fn_c_try_link "$LINENO"; then :

+  ac_cv_search_json_object_object_get=$ac_res

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext

+  if ${ac_cv_search_json_object_object_get+:} false; then :

+  break

+fi

+done

+if ${ac_cv_search_json_object_object_get+:} false; then :

+

+else

+  ac_cv_search_json_object_object_get=no

+fi

+rm conftest.$ac_ext

+LIBS=$ac_func_search_save_LIBS

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get" >&5

+$as_echo "$ac_cv_search_json_object_object_get" >&6; }

+ac_res=$ac_cv_search_json_object_object_get

+if test "$ac_res" != no; then :

+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

+

+have_json="yes"

+have_deprecated_json="yes"

+

+fi

+

+

 fi

@@ -17247,6 +17310,11 @@ if test "X$have_json" = "Xyes"; then

 $as_echo "#define HAVE_JSON 1" >>confdefs.h

+  if test "X$have_deprecated_json" = "Xyes"; then

+

+$as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h

+

+  fi

   JSON_LIBS="$LIBS"

 fi

@@ -3,6 +3,10 @@

 /* Define if building universal (internal helper macro) */

 #undef AC_APPLE_UNIVERSAL_BUILD

+/* Define to 1 if you have a deprecated version of the 'libjson' library

+   (-ljson). */

+#undef HAVE_DEPRECATED_JSON

+

 /* Define to 1 if you have the <dlfcn.h> header file. */

 #undef HAVE_DLFCN_H

@@ -16020,9 +16020,72 @@ $as_echo "$ac_cv_search_json_object_object_get_ex" >&6; }

 ac_res=$ac_cv_search_json_object_object_get_ex

 if test "$ac_res" != no; then :

   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-  have_json="yes"

+

+have_json="yes"

+have_deprecated_json="no"

+else

+

+have_json="no"

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5

+$as_echo_n "checking for library containing json_object_object_get... " >&6; }

+if ${ac_cv_search_json_object_object_get+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

-  have_json="no"

+  ac_func_search_save_LIBS=$LIBS

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char json_object_object_get ();

+int

+main ()

+{

+return json_object_object_get ();

+  ;

+  return 0;

+}

+_ACEOF

+for ac_lib in '' json-c json; do

+  if test -z "$ac_lib"; then

+    ac_res="none required"

+  else

+    ac_res=-l$ac_lib

+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"

+  fi

+  if ac_fn_c_try_link "$LINENO"; then :

+  ac_cv_search_json_object_object_get=$ac_res

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext

+  if ${ac_cv_search_json_object_object_get+:} false; then :

+  break

+fi

+done

+if ${ac_cv_search_json_object_object_get+:} false; then :

+

+else

+  ac_cv_search_json_object_object_get=no

+fi

+rm conftest.$ac_ext

+LIBS=$ac_func_search_save_LIBS

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get" >&5

+$as_echo "$ac_cv_search_json_object_object_get" >&6; }

+ac_res=$ac_cv_search_json_object_object_get

+if test "$ac_res" != no; then :

+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

+

+have_json="yes"

+have_deprecated_json="yes"

+

+fi

+

+

 fi

@@ -16034,6 +16097,11 @@ if test "X$have_json" = "Xyes"; then

 $as_echo "#define HAVE_JSON 1" >>confdefs.h

+  if test "X$have_deprecated_json" = "Xyes"; then

+

+$as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h

+

+  fi

   JSON_LIBS="$LIBS"

 fi

@@ -281,6 +281,30 @@ json_object *cli_jsonobj(json_object *obj, const char *key)

     return newobj;

 }

+#if HAVE_DEPRECATED_JSON

+int json_object_object_get_ex(struct json_object *obj, const char *key, struct json_object **value)

+{

+    struct json_object *res;

+

+    if (value != NULL)

+        *value = NULL;

+

+    if (obj == NULL)

+        return 0;

+

+    if (json_object_get_type(obj) != json_type_object)

+        return 0;

+

+    res = json_object_object_get(obj, key);

+    if (value != NULL) {

+        *value = res;

+        return (res != NULL);

+    }

+

+    return (res != NULL);

+}

+#endif

+

 #else

 int cli_json_nojson()

@@ -49,6 +49,10 @@ json_object *cli_jsonarray(json_object *obj, const char *key);

 int cli_jsonint_array(json_object *obj, int32_t val);

 json_object *cli_jsonobj(json_object *obj, const char *key);

+#if HAVE_DEPRECATED_JSON

+int json_object_object_get_ex(struct json_object *obj, const char *key, struct json_object **value);

+#endif

+

 #define JSON_KEY_FILETYPE   "FileType"

 #define JSON_KEY_FILESIZE   "FileSize"

@@ -62,7 +62,15 @@ then

     CFLAGS="$CFLAGS $JSON_CPPFLAGS"

   fi

-  AC_SEARCH_LIBS([json_object_object_get_ex], [json-c json], [have_json="yes"], [have_json="no"])

+  AC_SEARCH_LIBS([json_object_object_get_ex], [json-c json], [

+have_json="yes"

+have_deprecated_json="no"], [

+have_json="no"

+AC_SEARCH_LIBS([json_object_object_get], [json-c json], [

+have_json="yes"

+have_deprecated_json="yes"

+])

+])

   CFLAGS="$save_CFLAGS"

   LDFLAGS="$save_LDFLAGS"

@@ -70,6 +78,9 @@ fi

 if test "X$have_json" = "Xyes"; then

   AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])

+  if test "X$have_deprecated_json" = "Xyes"; then

+    AC_DEFINE([HAVE_DEPRECATED_JSON],1,[Define to 1 if you have a deprecated version of the 'libjson' library (-ljson).])

+  fi

   JSON_LIBS="$LIBS"

 fi