diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:44:55 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:45:11 +0200 |
| commit | 417496ece914e1ae5c61d9db9d748139a1156c56 (patch) | |
| tree | a31252db24d6198401d9c1adbb90cea2960a2f83 | |
| parent | aa3a6439d1f398ac56127057bbf75b6e4536721f (diff) | |
Remove libcryptsetup support
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/shared/build.h | 7 |
2 files changed, 0 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 1832405542..cc9c73f102 100644 --- a/configure.ac +++ b/configure.ac @@ -486,18 +486,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) # ------------------------------------------------------------------------------ -have_libcryptsetup=no -AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable libcryptsetup tools])) -if test "x$enable_libcryptsetup" != "xno"; then - PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup >= 1.6.0 ], - [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no) - if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then - AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"]) - -# ------------------------------------------------------------------------------ have_qrencode=no AC_ARG_ENABLE(qrencode, AS_HELP_STRING([--disable-qrencode], [disable qrencode support])) if test "x$enable_qrencode" != "xno"; then @@ -1097,7 +1085,6 @@ AC_OUTPUT AC_MSG_RESULT([ $PACKAGE_NAME $VERSION - libcryptsetup: ${have_libcryptsetup} PAM: ${have_pam} AppArmor: ${have_apparmor} SELinux: ${have_selinux} diff --git a/src/shared/build.h b/src/shared/build.h index 4583afd0e8..cdb6bdfad8 100644 --- a/src/shared/build.h +++ b/src/shared/build.h @@ -45,12 +45,6 @@ #define _SMACK_FEATURE_ "-SMACK" #endif -#ifdef HAVE_LIBCRYPTSETUP -#define _LIBCRYPTSETUP_FEATURE_ "+LIBCRYPTSETUP" -#else -#define _LIBCRYPTSETUP_FEATURE_ "-LIBCRYPTSETUP" -#endif - #ifdef HAVE_GNUTLS #define _GNUTLS_FEATURE_ "+GNUTLS" #else @@ -86,7 +80,6 @@ _SELINUX_FEATURE_ " " \ _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ - _LIBCRYPTSETUP_FEATURE_ " " \ _GNUTLS_FEATURE_ " " \ _ACL_FEATURE_ " " \ _SECCOMP_FEATURE_ " " \ |