chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove elfutils checks
[elogind.git]
/
src
/
shared
/
build.h
diff --git
a/src/shared/build.h
b/src/shared/build.h
index b0a5a724679e82c1a70b45f4991ac465bc079751..4583afd0e8878c5e6299416b767cf07b9c8c415d 100644
(file)
--- a/
src/shared/build.h
+++ b/
src/shared/build.h
@@
-27,12
+27,6
@@
#define _PAM_FEATURE_ "-PAM"
#endif
#define _PAM_FEATURE_ "-PAM"
#endif
-#ifdef HAVE_AUDIT
-#define _AUDIT_FEATURE_ "+AUDIT"
-#else
-#define _AUDIT_FEATURE_ "-AUDIT"
-#endif
-
#ifdef HAVE_SELINUX
#define _SELINUX_FEATURE_ "+SELINUX"
#else
#ifdef HAVE_SELINUX
#define _SELINUX_FEATURE_ "+SELINUX"
#else
@@
-45,12
+39,6
@@
#define _APPARMOR_FEATURE_ "-APPARMOR"
#endif
#define _APPARMOR_FEATURE_ "-APPARMOR"
#endif
-#ifdef HAVE_IMA
-#define _IMA_FEATURE_ "+IMA"
-#else
-#define _IMA_FEATURE_ "-IMA"
-#endif
-
#ifdef HAVE_SMACK
#define _SMACK_FEATURE_ "+SMACK"
#else
#ifdef HAVE_SMACK
#define _SMACK_FEATURE_ "+SMACK"
#else
@@
-63,12
+51,6
@@
#define _LIBCRYPTSETUP_FEATURE_ "-LIBCRYPTSETUP"
#endif
#define _LIBCRYPTSETUP_FEATURE_ "-LIBCRYPTSETUP"
#endif
-#ifdef HAVE_GCRYPT
-#define _GCRYPT_FEATURE_ "+GCRYPT"
-#else
-#define _GCRYPT_FEATURE_ "-GCRYPT"
-#endif
-
#ifdef HAVE_GNUTLS
#define _GNUTLS_FEATURE_ "+GNUTLS"
#else
#ifdef HAVE_GNUTLS
#define _GNUTLS_FEATURE_ "+GNUTLS"
#else
@@
-81,18
+63,6
@@
#define _ACL_FEATURE_ "-ACL"
#endif
#define _ACL_FEATURE_ "-ACL"
#endif
-#ifdef HAVE_XZ
-#define _XZ_FEATURE_ "+XZ"
-#else
-#define _XZ_FEATURE_ "-XZ"
-#endif
-
-#ifdef HAVE_LZ4
-#define _LZ4_FEATURE_ "+LZ4"
-#else
-#define _LZ4_FEATURE_ "-LZ4"
-#endif
-
#ifdef HAVE_SECCOMP
#define _SECCOMP_FEATURE_ "+SECCOMP"
#else
#ifdef HAVE_SECCOMP
#define _SECCOMP_FEATURE_ "+SECCOMP"
#else
@@
-105,18
+75,6
@@
#define _BLKID_FEATURE_ "-BLKID"
#endif
#define _BLKID_FEATURE_ "-BLKID"
#endif
-#ifdef HAVE_ELFUTILS
-#define _ELFUTILS_FEATURE_ "+ELFUTILS"
-#else
-#define _ELFUTILS_FEATURE_ "-ELFUTILS"
-#endif
-
-#ifdef HAVE_KMOD
-#define _KMOD_FEATURE_ "+KMOD"
-#else
-#define _KMOD_FEATURE_ "-KMOD"
-#endif
-
#ifdef HAVE_LIBIDN
#define _IDN_FEATURE_ "+IDN"
#else
#ifdef HAVE_LIBIDN
#define _IDN_FEATURE_ "+IDN"
#else
@@
-125,20
+83,12
@@
#define SYSTEMD_FEATURES \
_PAM_FEATURE_ " " \
#define SYSTEMD_FEATURES \
_PAM_FEATURE_ " " \
- _AUDIT_FEATURE_ " " \
_SELINUX_FEATURE_ " " \
_SELINUX_FEATURE_ " " \
- _IMA_FEATURE_ " " \
_APPARMOR_FEATURE_ " " \
_SMACK_FEATURE_ " " \
_APPARMOR_FEATURE_ " " \
_SMACK_FEATURE_ " " \
- _SYSVINIT_FEATURE_ " " \
_LIBCRYPTSETUP_FEATURE_ " " \
_LIBCRYPTSETUP_FEATURE_ " " \
- _GCRYPT_FEATURE_ " " \
_GNUTLS_FEATURE_ " " \
_ACL_FEATURE_ " " \
_GNUTLS_FEATURE_ " " \
_ACL_FEATURE_ " " \
- _XZ_FEATURE_ " " \
- _LZ4_FEATURE_ " " \
_SECCOMP_FEATURE_ " " \
_BLKID_FEATURE_ " " \
_SECCOMP_FEATURE_ " " \
_BLKID_FEATURE_ " " \
- _ELFUTILS_FEATURE_ " " \
- _KMOD_FEATURE_ " " \
_IDN_FEATURE_
_IDN_FEATURE_