46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
|
From 53872a0a1a267040677572c30b68bd1e8b62ebe3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Tue, 22 Oct 2024 11:01:25 +0100
|
||
|
|
Subject: [PATCH] build: Add new dependency on json-c
|
||
|
|
|
||
|
|
This will eventually replace Jansson for all JSON parsing. However
|
||
|
|
this commit simply introduces the new dependency in the configure
|
||
|
|
script and documents it.
|
||
|
|
|
||
|
|
I chose json-c 0.14 as the baseline since that is the version in RHEL 9.
|
||
|
|
Probably earlier versions would work.
|
||
|
|
---
|
||
|
|
docs/guestfs-building.pod | 4 ++++
|
||
|
|
m4/guestfs-libraries.m4 | 3 +++
|
||
|
|
2 files changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
|
||
|
|
index 2c084521..de175aaf 100644
|
||
|
|
--- a/docs/guestfs-building.pod
|
||
|
|
+++ b/docs/guestfs-building.pod
|
||
|
|
@@ -189,6 +189,10 @@ I<Required>.
|
||
|
|
|
||
|
|
I<Required>.
|
||
|
|
|
||
|
|
+=item json-c E<ge> 0.14
|
||
|
|
+
|
||
|
|
+I<Required>.
|
||
|
|
+
|
||
|
|
=item po4a
|
||
|
|
|
||
|
|
I<Required> if compiling from git.
|
||
|
|
diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
|
||
|
|
index 18c4cd30..ee406d27 100644
|
||
|
|
--- a/m4/guestfs-libraries.m4
|
||
|
|
+++ b/m4/guestfs-libraries.m4
|
||
|
|
@@ -304,6 +304,9 @@ LIBS="$old_LIBS"
|
||
|
|
dnl Check for Jansson JSON library (required).
|
||
|
|
PKG_CHECK_MODULES([JANSSON], [jansson >= 2.7])
|
||
|
|
|
||
|
|
+dnl Check for JSON-C library (required).
|
||
|
|
+PKG_CHECK_MODULES([JSON_C], [json-c >= 0.14])
|
||
|
|
+
|
||
|
|
dnl Check for C++ (optional, we just use this to test the header works).
|
||
|
|
AC_PROG_CXX
|
||
|
|
|