From ca285dcecfa43d2330af615aff8e942b0f1f7a04 Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Wed, 27 Nov 2024 21:56:31 +0530 Subject: [PATCH] Removed libjansson4 and some jansson mentions in configure.ac Signed-off-by: Sourav Moitra --- .github/workflows/test.yaml | 2 +- Containerfile | 1 - configure.ac | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b7053015..eb9522b7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -38,7 +38,7 @@ jobs: install: | apt-get update -q -y - apt-get install -q -y python3 automake libtool autotools-dev git make cmake pkg-config gcc wget xz-utils libjansson4 libjansson-dev + apt-get install -q -y python3 automake libtool autotools-dev git make cmake pkg-config gcc wget xz-utils libjansson-dev run: | # Configure and Run libocispec diff --git a/Containerfile b/Containerfile index 63ad25a0..b249382e 100644 --- a/Containerfile +++ b/Containerfile @@ -8,7 +8,6 @@ RUN apt-get update && \ libtool \ pkg-config \ python3 \ - libjansson4 \ libjansson-dev diff --git a/configure.ac b/configure.ac index 999893ab..14105b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,6 @@ AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign tar-ustar no-dist-gzip dist-xz s AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) -AM_CONDITIONAL([HAVE_EMBEDDED_JANSSON], [test x"$embedded_jansson" = xtrue]) -AM_COND_IF([HAVE_EMBEDDED_JANSSON], [], [ -AC_SEARCH_LIBS(json_object, [jansson], [AC_DEFINE([HAVE_JANSSON], 1, [Define if libjansson is available])], [AC_MSG_ERROR([*** libjansson headers not found])]) -PKG_CHECK_MODULES([JANSSON], [jansson >= 2.14]) -]) - # Optionally install the library. AC_ARG_ENABLE(libocispec-install, AS_HELP_STRING([--enable-libocispec-install], [Enable libocispec installation]),