From 8ea145e66ff9c21d817ca744e7011050f21a4eba Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Tue, 6 Feb 2024 10:31:43 -0600 Subject: [PATCH 1/2] prov/cxi: Fix check for non-standard json-c install The configure option is --with-json-c, so we need to check $with_json_c, not $with_json. Signed-off-by: Ken Raffenetti --- prov/cxi/configure.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prov/cxi/configure.m4 b/prov/cxi/configure.m4 index ec50e18f33c..8daf54e1df5 100644 --- a/prov/cxi/configure.m4 +++ b/prov/cxi/configure.m4 @@ -97,8 +97,8 @@ AC_DEFUN([FI_CXI_CONFIGURE],[ cxi_LIBS="$cxi_LIBS $libcurl_LIBS" # Add on json if installed in non-default location. - if test "$with_json" != "" && test "$with_json" != "no"; then - FI_CHECK_PREFIX_DIR([$with_json], [json]) + if test "$with_json_c" != "" && test "$with_json_c" != "no"; then + FI_CHECK_PREFIX_DIR([$with_json_c], [json]) else json_PREFIX="" json_LIBDIR="" From 5793243aec20c4fee126aa3093ff07bb5889f154 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Tue, 6 Feb 2024 10:33:45 -0600 Subject: [PATCH 2/2] prov/cxi: Remove checks for unused headers Signed-off-by: Ken Raffenetti --- prov/cxi/configure.m4 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/prov/cxi/configure.m4 b/prov/cxi/configure.m4 index 8daf54e1df5..1a3b0b835c2 100644 --- a/prov/cxi/configure.m4 +++ b/prov/cxi/configure.m4 @@ -44,14 +44,6 @@ AC_DEFUN([FI_CXI_CONFIGURE],[ AS_IF([test x"$enable_cxi" != x"no"], [ - AC_CHECK_HEADER(cxi_prov_hw.h, - [], - [cxi_happy=0]) - - AC_CHECK_HEADER(uapi/misc/cxi.h, - [], - [cxi_happy=0]) - FI_CHECK_PACKAGE([libcxi], [libcxi/libcxi.h], [cxi],