X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fbuild.h;h=6329a8fc39d4ce936d81ee75fef85cbd810fe95f;hb=9742b1e43855b1599bd52ff95af995d9a9d35eac;hp=566bb74d8edc3bc53d7283760fa24366257942db;hpb=2ce8152bd305e6cb29732222649db8b662e10113;p=elogind.git

diff --git a/src/basic/build.h b/src/basic/build.h
index 566bb74d8..6329a8fc3 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,41 +31,30 @@
 #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
 #define _SMACK_FEATURE_ "-SMACK"
 #endif
 
-#ifdef HAVE_ACL
-#define _ACL_FEATURE_ "+ACL"
+#ifdef HAVE_UTMP
+#define _UTMP_FEATURE_ "+UTMP"
 #else
-#define _ACL_FEATURE_ "-ACL"
+#define _UTMP_FEATURE_ "-UTMP"
 #endif
 
-#ifdef HAVE_SECCOMP
-#define _SECCOMP_FEATURE_ "+SECCOMP"
+#ifdef HAVE_ACL
+#define _ACL_FEATURE_ "+ACL"
 #else
-#define _SECCOMP_FEATURE_ "-SECCOMP"
+#define _ACL_FEATURE_ "-ACL"
 #endif
 
-#ifdef HAVE_BLKID
-#define _BLKID_FEATURE_ "+BLKID"
-#else
-#define _BLKID_FEATURE_ "-BLKID"
-#endif
+#define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
 
 #define SYSTEMD_FEATURES                                                \
         _PAM_FEATURE_ " "                                               \
         _SELINUX_FEATURE_ " "                                           \
-        _APPARMOR_FEATURE_ " "                                          \
         _SMACK_FEATURE_ " "                                             \
+        _UTMP_FEATURE_ " "                                              \
         _ACL_FEATURE_ " "                                               \
-        _SECCOMP_FEATURE_ " "                                           \
-        _BLKID_FEATURE_ " "
+        _CGROUP_HIEARCHY_