chiark / gitweb /
Remove gnutls check
authorAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 13:47:35 +0000 (15:47 +0200)
committerAndy Wingo <wingo@pobox.com>
Sun, 19 Apr 2015 13:47:35 +0000 (15:47 +0200)
configure.ac
src/shared/build.h

index 18f2669..6924e01 100644 (file)
@@ -486,18 +486,6 @@ fi
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
 # ------------------------------------------------------------------------------
-have_gnutls=no
-AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--disable-gnutls], [disable gnutls support]))
-if test "x$enable_gnutls" != "xno"; then
-        PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.4],
-                [AC_DEFINE(HAVE_GNUTLS, 1, [Define if gnutls is available]) have_gnutls=yes], have_gnutls=no)
-        if test "x$have_gnutls" = xno -a "x$enable_gnutls" = xyes; then
-                AC_MSG_ERROR([*** gnutls support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_GNUTLS, [test "$have_gnutls" = "yes"])
-
-# ------------------------------------------------------------------------------
 have_libcurl=no
 AC_ARG_ENABLE(libcurl, AS_HELP_STRING([--disable-libcurl], [disable libcurl support]))
 if test "x$enable_libcurl" != "xno"; then
@@ -1067,7 +1055,6 @@ AC_MSG_RESULT([
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
-        GNUTLS:                  ${have_gnutls}
         libcurl:                 ${have_libcurl}
         libidn:                  ${have_libidn}
         binfmt:                  ${have_binfmt}
index cdb6bdf..42b3493 100644 (file)
 #define _SMACK_FEATURE_ "-SMACK"
 #endif
 
-#ifdef HAVE_GNUTLS
-#define _GNUTLS_FEATURE_ "+GNUTLS"
-#else
-#define _GNUTLS_FEATURE_ "-GNUTLS"
-#endif
-
 #ifdef HAVE_ACL
 #define _ACL_FEATURE_ "+ACL"
 #else
@@ -80,7 +74,6 @@
         _SELINUX_FEATURE_ " "                                           \
         _APPARMOR_FEATURE_ " "                                          \
         _SMACK_FEATURE_ " "                                             \
-        _GNUTLS_FEATURE_ " "                                            \
         _ACL_FEATURE_ " "                                               \
         _SECCOMP_FEATURE_ " "                                           \
         _BLKID_FEATURE_ " "                                             \