From 7e4ea7bffdf2afa7c6f8d0aa9a8c5c227ed557b4 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sun, 21 Mar 2021 16:02:40 +0100 Subject: [PATCH] configure: fix strchrnul conditiona compilation Signed-off-by: Christian Brauner --- configure.ac | 6 +++++- src/lxc/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7c7b34872..b329b4ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -640,7 +640,7 @@ AC_CHECK_HEADER([ifaddrs.h], AC_HEADER_MAJOR # Check for some syscalls functions -AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3 fsopen fspick fsconfig fsmount, openat2, close_range, statvfs, strchrnul]) +AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat gettid memfd_create move_mount open_tree execveat clone3 fsopen fspick fsconfig fsmount, openat2, close_range, statvfs]) AC_CHECK_TYPES([__aligned_u64], [], [], [[#include ]]) AC_CHECK_TYPES([struct open_how], [], [], [[#include ]]) AC_CHECK_TYPES([struct clone_args], [], [], [[#include ]]) @@ -727,6 +727,10 @@ AC_CHECK_FUNCS([strlcat], AM_CONDITIONAL(HAVE_STRLCAT, true) AC_DEFINE(HAVE_STRLCAT,1,[Have strlcat]), AM_CONDITIONAL(HAVE_STRLCAT, false)) +AC_CHECK_FUNCS([strchrnul], + AM_CONDITIONAL(HAVE_STRCHRNUL, true) + AC_DEFINE(HAVE_STRCHRNUL,1,[Have strchnul]), + AM_CONDITIONAL(HAVE_STRCHRNUL, false)) AC_CHECK_FUNCS([fmemopen], AM_CONDITIONAL(HAVE_FMEMOPEN, true) AC_DEFINE(HAVE_FMEMOPEN,1,[Have fmemopen]), diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 634396fa8..5938a560a 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -201,6 +201,10 @@ if !HAVE_STRLCAT liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h endif +if !HAVE_STRCHRNUL +liblxc_la_SOURCES += ../include/strchrnul.c ../include/strchrnul.h +endif + if ENFORCE_MEMFD_REXEC liblxc_la_SOURCES += rexec.c rexec.h endif -- 2.47.2