[Pkg-gnupg-commit] [gnupg2] 112/205: build: Check for conflicting trust model options.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 6060ea898fda499211c9d5030fff41d58f899fb0
Author: Justus Winter <justus at g10code.com>
Date:   Fri Apr 1 14:53:48 2016 +0200

    build: Check for conflicting trust model options.
    
    * configure.ac: Disable TOFU if configured without trust models, and
    check for conflicting options.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 003e509..0163dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,8 +263,11 @@ AC_MSG_CHECKING([whether to enable TOFU])
 AC_ARG_ENABLE(tofu,
                 AC_HELP_STRING([--disable-tofu],
                                [disable the TOFU trust model]),
-              use_tofu=$enableval, use_tofu=yes)
+              use_tofu=$enableval, use_tofu=$use_trust_models)
 AC_MSG_RESULT($use_tofu)
+if test "$use_trust_models" = no && test "$use_tofu" = yes; then
+    AC_MSG_ERROR([both --disable-trust-models and --enable-tofu given])
+fi
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git