meson: Add init helper scripts

[mirror_lxc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f7ca355567afb9636222b74df3f0bbb69b471041..581f0d7d495b891b1388c1c044fd3c5f70864c64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -500,7 +500,9 @@ if test "x$enable_fuzzers" = "xyes"; then
                CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[ \
                        -DRUN_ON_OSS_FUZZ=1])
        fi
-else
+fi
+
+if test "x$enable_fuzzers" = "xno" -a "x$enable_sanitizers" = "xno"; then
        CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[-flto=thin])
 fi
 AC_SUBST(AM_CFLAGS)
@@ -636,19 +638,19 @@ AM_COND_IF([ENABLE_PAM],
                [pamdir],
                [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored,
                                                        or "none" if PAM modules are not to be built])],
-               [pamdir=$withval],
+               [exec_pamdir=$withval],
                [
                        if test "${prefix}" = "/usr"; then
-                               pamdir="/lib${libdir##*/lib}/security"
+                               exec_pamdir="/lib${libdir##*/lib}/security"
                        else
-                               pamdir="\$(libdir)/security"
+                               exec_pamdir="\$(libdir)/security"
                        fi
                ]
        )])
 
-AM_CONDITIONAL([HAVE_PAM], [test x"$pamdir" != "xnone"])
+AM_CONDITIONAL([HAVE_PAM], [test x"$exec_pamdir" != "xnone"])
 AM_COND_IF([ENABLE_PAM],
-       [if test "z$pamdir" != "znone"; then
+       [if test "z$exec_pamdir" != "znone"; then
                AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
                AC_ARG_VAR([PAM_LIBS], [linker flags for pam])
                AC_CHECK_LIB(
@@ -659,7 +661,7 @@ AM_COND_IF([ENABLE_PAM],
                        ])
 
                AC_SUBST(PAM_LIBS)
-               AC_SUBST([pamdir])
+               AC_SUBST([exec_pamdir])
        fi])
 
 # Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
@@ -697,7 +699,7 @@ AM_COND_IF([ENABLE_LIBURING],
 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 mount_setattr])
+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 mount_setattr sigdescr_np])
 AC_CHECK_TYPES([__aligned_u64], [], [], [[#include <linux/types.h>]])
 AC_CHECK_TYPES([struct mount_attr], [], [], [[#include <linux/mount.h>]])
 AC_CHECK_TYPES([struct open_how], [], [], [[#include <linux/openat2.h>]])
@@ -775,9 +777,6 @@ AC_CHECK_TYPES([struct rtnl_link_stats64], [], [], [[#include <linux/if_link.h>]
 AX_PTHREAD
 AC_SEARCH_LIBS(clock_gettime, [rt])
 
-# See if we support thread-local storage.
-LXC_CHECK_TLS
-
 # Hardening flags
 CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[ \
        -fPIE \
@@ -1130,7 +1129,7 @@ Security features:
 
 PAM:
  - PAM module: $enable_pam
- - cgroup PAM module: $pamdir
+ - cgroup PAM module: $exec_pamdir
 
 Documentation:
  - examples: $enable_examples