X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fbuild.h;h=856519f6150a5d0d66272f48d7db373189f96c5b;hp=42b34933c60750c7dd51355d6f9abbd899e352d1;hb=5b9a4d1cfe8bbff9ec6fee00acab3f837613fa2c;hpb=75a322055981a2d54b50ddb1d7c2649068ca1dc9 diff --git a/src/basic/build.h b/src/basic/build.h index 42b34933c..856519f61 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -33,12 +31,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,30 +43,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 - -#ifdef HAVE_LIBIDN -#define _IDN_FEATURE_ "+IDN" -#else -#define _IDN_FEATURE_ "-IDN" -#endif - #define SYSTEMD_FEATURES \ _PAM_FEATURE_ " " \ _SELINUX_FEATURE_ " " \ - _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ - _ACL_FEATURE_ " " \ - _SECCOMP_FEATURE_ " " \ - _BLKID_FEATURE_ " " \ - _IDN_FEATURE_ + _ACL_FEATURE_ " "