diff options
| author | Werner Koch <wk@gnupg.org> | 2015-10-20 17:32:23 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-10-20 17:32:23 +0200 |
| commit | 734c61dc9d4915605816803182c9adcc1594e008 (patch) | |
| tree | ffc41ebe8bbc43f131ccf78708d2ca24388a7f31 /g10/Makefile.am | |
| parent | gpg: Don't die immediately if the TOFU DB is locked. (diff) | |
| download | gnupg2-734c61dc9d4915605816803182c9adcc1594e008.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'g10/Makefile.am')
| -rw-r--r-- | g10/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index 73578435d..75ccac85f 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -56,6 +56,12 @@ else trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h endif +if USE_TOFU +tofu_source = tofu.h tofu.c +else +tofu_source = +endif + if HAVE_W32_SYSTEM resource_objs += gpg-w32info.o @@ -124,10 +130,9 @@ gpg2_SOURCES = gpg.c \ call-dirmngr.c call-dirmngr.h \ photoid.c photoid.h \ call-agent.c call-agent.h \ - trust.c $(trust_source) \ + trust.c $(trust_source) $(tofu_source) \ $(card_source) \ - exec.c exec.h \ - tofu.h tofu.c + exec.c exec.h gpgv2_SOURCES = gpgv.c \ $(common_source) \ |