diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:26:27 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:37:11 +0200 |
| commit | 70238105246969a045d0e256ed3983afe5ddbb96 (patch) | |
| tree | 336305d812c66df8bcf7fe5fae8f2f49c6dbe622 | |
| parent | 6102459f1761588f23e1ecbfa373bccd3dd52b7b (diff) | |
Remove gcrypt checks
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | src/shared/build.h | 7 |
2 files changed, 0 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index ea363c5a26..ef47c5fcff 100644 --- a/configure.ac +++ b/configure.ac @@ -486,39 +486,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 @@ -1221,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} diff --git a/src/shared/build.h b/src/shared/build.h index 9f048ee64f..09ca99a160 100644 --- a/src/shared/build.h +++ b/src/shared/build.h @@ -57,12 +57,6 @@ #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 @@ -106,7 +100,6 @@ _APPARMOR_FEATURE_ " " \ _SMACK_FEATURE_ " " \ _LIBCRYPTSETUP_FEATURE_ " " \ - _GCRYPT_FEATURE_ " " \ _GNUTLS_FEATURE_ " " \ _ACL_FEATURE_ " " \ _SECCOMP_FEATURE_ " " \ |