On 10/23/25 10:57 AM, Anthony PERARD wrote:
From: Anthony PERARD<[email protected]>
If not available, fallback to using YAJL.
The code is using json_c_visit() which was introduced in 0.13.
json_object_new_null() and json_object_new_uint64() where added to
0.14. And the last one json_object_new_array_ext() was introduced in
0.15.
Signed-off-by: Anthony PERARD<[email protected]>
Release-Acked-by: Oleksii Kurochko<[email protected]>
Thanks.
~ Oleksii
---
tools/configure | 16 ++++++++--------
tools/configure.ac | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/configure b/tools/configure
index 0eb7a0ab6a..d460f25529 100755
--- a/tools/configure
+++ b/tools/configure
@@ -9642,12 +9642,12 @@ if test -n "$libjsonc_CFLAGS"; then
pkg_cv_libjsonc_CFLAGS="$libjsonc_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"json-c\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c
>= 0.15\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c >= 0.15") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_libjsonc_CFLAGS=`$PKG_CONFIG --cflags "json-c" 2>/dev/null`
+ pkg_cv_libjsonc_CFLAGS=`$PKG_CONFIG --cflags "json-c >= 0.15" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -9659,12 +9659,12 @@ if test -n "$libjsonc_LIBS"; then
pkg_cv_libjsonc_LIBS="$libjsonc_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"json-c\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c
>= 0.15\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c >= 0.15") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_libjsonc_LIBS=`$PKG_CONFIG --libs "json-c" 2>/dev/null`
+ pkg_cv_libjsonc_LIBS=`$PKG_CONFIG --libs "json-c >= 0.15" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -9685,9 +9685,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- libjsonc_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs
"json-c" 2>&1`
+ libjsonc_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs
"json-c >= 0.15" 2>&1`
else
- libjsonc_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"json-c" 2>&1`
+ libjsonc_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >=
0.15" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$libjsonc_PKG_ERRORS" >&5
diff --git a/tools/configure.ac b/tools/configure.ac
index 7267d02a04..285b4ea128 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -424,7 +424,7 @@ AC_SUBST([ZLIB_CFLAGS])
AC_SUBST([ZLIB_LIBS])
AX_CHECK_EXTFS
AX_CHECK_PTHREAD
-PKG_CHECK_MODULES([libjsonc], [json-c],
+PKG_CHECK_MODULES([libjsonc], [json-c >= 0.15],
[AC_DEFINE([HAVE_LIBJSONC], [1], [Use library json-c])],
[AC_CHECK_LIB([yajl], [yajl_alloc],
[AC_SUBST([YAJL_LIBS],[-lyajl])
