diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-01-17 08:51:20 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:22:36 +0100 |
| commit | 49f1af61c4ed0fd8061a014a47b2c8698c094950 (patch) | |
| tree | d8d2778718ea87532b53e137910c0df149a9dc77 /src/basic | |
| parent | 6dc0e0960950dfab94babbaced9626225f3f230f (diff) | |
Remove APPARMOR, BLKID and SECCOMP checks and feature.
Remove logind check, it is always built as elogind anyway.
Remove ENABLE_LOGIND conditional from man pages.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/build.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/basic/build.h b/src/basic/build.h index 566bb74d8..c63b7cc01 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -33,12 +33,6 @@ #define _SELINUX_FEATURE_ "-SELINUX" #endif -#ifdef HAVE_APPARMOR -#define _APPARMOR_FEATURE_ "+APPARMOR" -#else -#define _APPARMOR_FEATURE_ "-APPARMOR" -#endif - #ifdef HAVE_SMACK #define _SMACK_FEATURE_ "+SMACK" #else @@ -51,23 +45,8 @@ #define _ACL_FEATURE_ "-ACL" #endif -#ifdef HAVE_SECCOMP -#define _SECCOMP_FEATURE_ "+SECCOMP" -#else -#define _SECCOMP_FEATURE_ "-SECCOMP" -#endif - -#ifdef HAVE_BLKID -#define _BLKID_FEATURE_ "+BLKID" -#else -#define _BLKID_FEATURE_ "-BLKID" -#endif - #define SYSTEMD_FEATURES \ _PAM_FEATURE_ " " \ _SELINUX_FEATURE_ " " \ - _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ - _ACL_FEATURE_ " " \ - _SECCOMP_FEATURE_ " " \ - _BLKID_FEATURE_ " " + _ACL_FEATURE_ " " |