diff options
| author | Werner Koch <[email protected]> | 2015-10-20 15:32:23 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-20 15:32:23 +0000 |
| commit | 734c61dc9d4915605816803182c9adcc1594e008 (patch) | |
| tree | ffc41ebe8bbc43f131ccf78708d2ca24388a7f31 /g10/keylist.c | |
| parent | gpg: Don't die immediately if the TOFU DB is locked. (diff) | |
| download | gnupg-734c61dc9d4915605816803182c9adcc1594e008.tar.gz gnupg-734c61dc9d4915605816803182c9adcc1594e008.zip | |
build: Allow building without SQLlite support.
* configure.ac: Add option --dsiable-tofu and --disable-sqlite.
(NEED_SQLITE_VERSION): New var.
(USE_TOFU): New ac_define and am_conditional.
* autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
pkg-config find the correct .pc file.
* g10/Makefile.am (tofu_source): New. Build only if enabled.
* g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
(parse_tofu_policy)[!USE_TOFU]: Disable all.
(parse_tofu_db_format)[!USE_TOFU]: Disable all.
(main) <aTOFUPolicy>[!USE_TOFU]: Skip.
* g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
call tofu functions.
* g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
* g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
processing.
--
This allows to build a minimal version of GnuPG. It is also currently
required to build for Windows.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 154169718..2a766a140 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1501,10 +1501,12 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr) es_fprintf (es_stdout, "::::::::"); if (opt.trust_model == TM_TOFU || opt.trust_model == TM_TOFU_PGP) { +#ifdef USE_TOFU enum tofu_policy policy; if (! tofu_get_policy (pk, uid, &policy) && policy != TOFU_POLICY_NONE) es_fprintf (es_stdout, "%s", tofu_policy_str (policy)); +#endif /*USE_TOFU*/ } es_putc (':', es_stdout); es_putc ('\n', es_stdout); |