diff options
| author | David Bremner <david@tethera.net> | 2016-06-26 17:29:45 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-06-29 09:05:49 +0200 |
| commit | 3a45d29ed4d753bcf72f2fa0bb37fefd4d18f96a (patch) | |
| tree | c4dffae574ab108a7ab2d755280239bd400d1b51 | |
| parent | 6450813e8f211c87e9a2b48c76fb0c99c57410d2 (diff) | |
lib: add built_with handling for XAPIAN_DB_RETRY_LOCK
This support will be present only if the appropriate version of xapian
is available _and_ the user did not disable the feature when
building. So there really needs to be some way for the user to check.
| -rw-r--r-- | lib/built-with.c | 2 | ||||
| -rw-r--r-- | notmuch-config.c | 3 | ||||
| -rwxr-xr-x | test/T030-config.sh | 1 | ||||
| -rwxr-xr-x | test/T040-setup.sh | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/lib/built-with.c b/lib/built-with.c index 635ed3b3..2f1f0b5c 100644 --- a/lib/built-with.c +++ b/lib/built-with.c @@ -28,6 +28,8 @@ notmuch_built_with (const char *name) return HAVE_XAPIAN_COMPACT; } else if (STRNCMP_LITERAL (name, "field_processor") == 0) { return HAVE_XAPIAN_FIELD_PROCESSOR; + } else if (STRNCMP_LITERAL (name, "retry_lock") == 0) { + return HAVE_XAPIAN_DB_RETRY_LOCK; } else { return FALSE; } diff --git a/notmuch-config.c b/notmuch-config.c index de9a8a41..e5d42a0c 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -911,6 +911,9 @@ _notmuch_config_list_built_with () printf("%sfield_processor=%s\n", BUILT_WITH_PREFIX, notmuch_built_with ("field_processor") ? "true" : "false"); + printf("%sretry_lock=%s\n", + BUILT_WITH_PREFIX, + notmuch_built_with ("retry_lock") ? "true" : "false"); } static int diff --git a/test/T030-config.sh b/test/T030-config.sh index b8d5a86f..0915abdb 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -59,6 +59,7 @@ foo.string=this is another string value foo.list=this;is another;list value; built_with.compact=something built_with.field_processor=something +built_with.retry_lock=something EOF test_expect_equal_file EXPECTED OUTPUT diff --git a/test/T040-setup.sh b/test/T040-setup.sh index be2f0dbd..021f2d0b 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -31,6 +31,7 @@ search.exclude_tags=baz; maildir.synchronize_flags=true crypto.gpg_path=gpg built_with.compact=something -built_with.field_processor=something" +built_with.field_processor=something +built_with.retry_lock=something" test_done |