Remove gcrypt checks

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ffe648caa49c680eccca55ae462218103422592f..ef47c5fcffa40c71f3e71ed11e25220040ac770b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -373,22 +373,6 @@ fi
 AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"])
 
 
-AC_ARG_WITH(debug-shell,
-        AS_HELP_STRING([--with-debug-shell=PATH],
-                [Path to debug shell binary]),
-        [SUSHELL="$withval"],[
-        AS_IF([test "x${have_selinux}" != "xno"], [SUSHELL="/sbin/sushell"] , [SUSHELL="/bin/sh"])])
-
-AC_SUBST(SUSHELL)
-
-AC_ARG_WITH([debug-tty],
-        AS_HELP_STRING([--with-debug-tty=PATH],
-                [Specify the tty device for debug shell]),
-        [DEBUGTTY="$withval"],
-        [DEBUGTTY=/dev/tty9])
-
-AC_SUBST(DEBUGTTY)
-
 AC_ARG_WITH([certificate-root],
         AS_HELP_STRING([--with-certificate-root=PATH],
                 [Specify the prefix for TLS certificates [/etc/ssl]]),
@@ -501,39 +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]),
@@ -1237,7 +1188,6 @@ AC_MSG_RESULT([
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
-        GCRYPT:                  ${have_gcrypt}
         QRENCODE:                ${have_qrencode}
         MICROHTTPD:              ${have_microhttpd}
         GNUTLS:                  ${have_gnutls}
@@ -1314,7 +1264,6 @@ AC_MSG_RESULT([
         Zsh completions dir:     ${with_zshcompletiondir}
         Extra start script:      ${RC_LOCAL_SCRIPT_PATH_START}
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
-        Debug shell:             ${SUSHELL} @ ${DEBUGTTY}
         TTY GID:                 ${TTY_GID}
         Maximum System UID:      ${SYSTEM_UID_MAX}
         Maximum System GID:      ${SYSTEM_GID_MAX}