diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-05-23 17:22:48 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:58 +0200 |
| commit | c6edc23d5f8a483e93a891bf7eb76b5f4caf2fb4 (patch) | |
| tree | a397302a1b4a6fc4018a55f73e9e044b4183e86d /configure.ac | |
| parent | 01fd08090305c451325783d8ca5a89416fcacfaa (diff) | |
Prep v230: Apply missing upstream fixes and updates (1/8) root build files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 16cb50906..a327e2c39 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.64]) AC_INIT([elogind], - [229.1], + [230], [https://github.com/elogind/elogind/issues], [elogind], [https://github.com/elogind/elogind]) @@ -343,11 +343,20 @@ AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not CAP_LIBS="$LIBS" AC_SUBST(CAP_LIBS) -AC_CHECK_FUNCS([memfd_create]) AC_CHECK_FUNCS([__secure_getenv secure_getenv]) -AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, - char16_t, char32_t, LO_FLAGS_PARTSCAN], - [], [], [[ +AC_CHECK_DECLS([ + memfd_create, + gettid, + pivot_root, + name_to_handle_at, + setns, + getrandom, + renameat2, + kcmp, + keyctl, + LO_FLAGS_PARTSCAN, + copy_file_range], + [], [], [[ #include <sys/types.h> #include <unistd.h> #include <sys/mount.h> @@ -357,6 +366,11 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renamea #include <linux/random.h> ]]) +AC_CHECK_TYPES([char16_t, char32_t, key_serial_t], + [], [], [[ +#include <uchar.h> +]]) + AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, IFLA_MACVLAN_FLAGS, IFLA_IPVLAN_MODE, @@ -368,8 +382,9 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, IFLA_IPTUN_ENCAP_DPORT, IFLA_GRE_ENCAP_DPORT, IFLA_BRIDGE_VLAN_INFO, + IFLA_BRPORT_PROXYARP, IFLA_BRPORT_LEARNING_SYNC, - IFLA_BR_PRIORITY, + IFLA_BR_VLAN_DEFAULT_PVID, NDA_IFINDEX, IFA_FLAGS], [], [], [[ @@ -444,6 +459,17 @@ fi AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"]) # ------------------------------------------------------------------------------ +AC_ARG_WITH([kill-user-processes], + [AS_HELP_STRING([--without-kill-user-processes], [Set elogind's KillUserProcesses=no by default])]) +AS_IF([test "$with_kill_user_processes" != "no"], + [kill_user_processes=true + KILL_USER_PROCESSES=yes], + [kill_user_processes=false + KILL_USER_PROCESSES=no]) +AC_DEFINE_UNQUOTED(KILL_USER_PROCESSES, [$kill_user_processes], [Default KillUserProcesses setting]) +AC_SUBST(KILL_USER_PROCESSES) + +# ------------------------------------------------------------------------------ AC_ARG_ENABLE([pam], AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), [case "${enableval}" in @@ -750,6 +776,7 @@ AC_MSG_RESULT([ SELinux: ${have_selinux} SMACK: ${have_smack} ACL: ${have_acl} + KillUserProcesses default: ${KILL_USER_PROCESSES} polkit: ${have_polkit} kdbus: ${have_kdbus} Python: ${have_python} |