X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=cc9c73f102ce28dc39946d3930bac1cb09456f5c;hb=417496ece914e1ae5c61d9db9d748139a1156c56;hp=ea363c5a26c171a638a90c936eb6fdc0058e4c06;hpb=6102459f1761588f23e1ecbfa373bccd3dd52b7b;p=elogind.git

diff --git a/configure.ac b/configure.ac
index ea363c5a2..cc9c73f10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,134 +485,6 @@ fi
 
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([gcrypt],
-        AS_HELP_STRING([--disable-gcrypt],[Disable optional GCRYPT support]),
-                [case "${enableval}" in
-                        yes) have_gcrypt=yes ;;
-                        no) have_gcrypt=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-gcrypt) ;;
-                esac],
-                [have_gcrypt=auto])
-
-if test "x${have_gcrypt}" != xno ; then
-        AM_PATH_LIBGCRYPT(
-                [1.4.5],
-                [have_gcrypt=yes],
-                [if test "x$have_gcrypt" = xyes ; then
-                        AC_MSG_ERROR([*** GCRYPT headers not found.])
-                fi])
-
-        if test "x$have_gcrypt" = xyes ; then
-                GCRYPT_LIBS="$LIBGCRYPT_LIBS"
-                GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
-                AC_DEFINE(HAVE_GCRYPT, 1, [GCRYPT available])
-        else
-                have_gcrypt=no
-        fi
-else
-        GCRYPT_LIBS=
-        GCRYPT_CFLAGS=
-fi
-AC_SUBST(GCRYPT_LIBS)
-AC_SUBST(GCRYPT_CFLAGS)
-AM_CONDITIONAL([HAVE_GCRYPT], [test "x$have_gcrypt" != xno])
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([audit],
-        AS_HELP_STRING([--disable-audit],[Disable optional AUDIT support]),
-                [case "${enableval}" in
-                        yes) have_audit=yes ;;
-                        no) have_audit=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-audit) ;;
-                esac],
-                [have_audit=auto])
-
-if test "x${have_audit}" != xno ; then
-        AC_CHECK_HEADERS(
-                [libaudit.h],
-                [have_audit=yes],
-                [if test "x$have_audit" = xyes ; then
-                        AC_MSG_ERROR([*** AUDIT headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [audit],
-                [audit_open],
-                [have_audit=yes],
-                [if test "x$have_audit" = xyes ; then
-                        AC_MSG_ERROR([*** libaudit not found.])
-                fi])
-
-        if test "x$have_audit" = xyes ; then
-                AUDIT_LIBS="-laudit"
-                AC_DEFINE(HAVE_AUDIT, 1, [AUDIT available])
-        else
-                have_audit=no
-        fi
-else
-        AUDIT_LIBS=
-fi
-AC_SUBST(AUDIT_LIBS)
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([elfutils],
-        AS_HELP_STRING([--disable-elfutils],[Disable optional ELFUTILS support]),
-                [case "${enableval}" in
-                        yes) have_elfutils=yes ;;
-                        no) have_elfutils=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-elfutils) ;;
-                esac],
-                [have_elfutils=auto])
-
-if test "x${have_elfutils}" != xno ; then
-        AC_CHECK_HEADERS(
-                [elfutils/libdwfl.h],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_begin],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS libs not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_core_file_attach],
-                [have_elfutils=yes],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS >= 158 is required.])
-                fi])
-
-        if test "x$have_elfutils" = xyes ; then
-                ELFUTILS_LIBS="-lelf -ldw"
-                AC_DEFINE(HAVE_ELFUTILS, 1, [ELFUTILS available])
-        else
-                have_elfutils=no
-        fi
-else
-        ELFUTILS_LIBS=
-fi
-AC_SUBST(ELFUTILS_LIBS)
-AM_CONDITIONAL(HAVE_ELFUTILS, [test "$have_elfutils" = "yes"])
-
-# ------------------------------------------------------------------------------
-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]))
@@ -1213,21 +1085,17 @@ AC_OUTPUT
 AC_MSG_RESULT([
         $PACKAGE_NAME $VERSION
 
-        libcryptsetup:           ${have_libcryptsetup}
         PAM:                     ${have_pam}
-        AUDIT:                   ${have_audit}
         AppArmor:                ${have_apparmor}
         SELinux:                 ${have_selinux}
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
-        GCRYPT:                  ${have_gcrypt}
         QRENCODE:                ${have_qrencode}
         MICROHTTPD:              ${have_microhttpd}
         GNUTLS:                  ${have_gnutls}
         libcurl:                 ${have_libcurl}
         libidn:                  ${have_libidn}
-        ELFUTILS:                ${have_elfutils}
         binfmt:                  ${have_binfmt}
         vconsole:                ${have_vconsole}
         bootchart:               ${have_bootchart}