From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 2 Jan 2013 18:06:55 +0000 (+0100)
Subject: tpm support is disabled by default
X-Git-Tag: gnutls_3_1_6~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fcbd34c953304dd06ebd49389af4b78575bd55b;p=thirdparty%2Fgnutls.git

tpm support is disabled by default
---

diff --git a/configure.ac b/configure.ac
index a8393760d7..714a434aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,8 +273,9 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 AC_ARG_WITH(tpm,
-	AS_HELP_STRING([--without-tpm],
-		[Build without TPM (trousers) support]))
+	AS_HELP_STRING([--with-tpm],
+		[Build with TPM (trousers) support. Note that trousers is under the Common Public License and incompatible with GPL programs.]),
+		[with_tpm=$withval], [with_tpm=no])
 if test "$with_tpm" != "no"; then
     LIBS="$oldlibs -ltspi"
     AC_MSG_CHECKING([for tss library])