chiark / gitweb /
Remove libcryptsetup support
authorAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 13:44:55 +0000 (15:44 +0200)
committerAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 13:45:11 +0000 (15:45 +0200)
configure.ac
src/shared/build.h

index 1832405..cc9c73f 100644 (file)
@@ -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}
index 4583afd..cdb6bdf 100644 (file)
 #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_ " "                                           \