1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 03A5E6DE01C2
\r
6 for <notmuch@notmuchmail.org>; Sun, 26 Jun 2016 08:30:06 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.006, HEADER_FROM_DIFFERENT_DOMAINS=0.001]
\r
14 Received: from arlo.cworth.org ([127.0.0.1])
\r
15 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id QxQUH5QIif0v for <notmuch@notmuchmail.org>;
\r
17 Sun, 26 Jun 2016 08:29:58 -0700 (PDT)
\r
18 Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
\r
19 by arlo.cworth.org (Postfix) with ESMTPS id D119C6DE028C
\r
20 for <notmuch@notmuchmail.org>; Sun, 26 Jun 2016 08:29:57 -0700 (PDT)
\r
21 Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
\r
22 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
23 id 1bHC0B-00022p-VP; Sun, 26 Jun 2016 11:29:39 -0400
\r
24 Received: (nullmailer pid 26563 invoked by uid 1000);
\r
25 Sun, 26 Jun 2016 15:29:48 -0000
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [PATCH 3/3] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK
\r
29 Date: Sun, 26 Jun 2016 17:29:45 +0200
\r
30 Message-Id: <1466954985-25761-4-git-send-email-david@tethera.net>
\r
31 X-Mailer: git-send-email 2.8.1
\r
32 In-Reply-To: <1466954985-25761-1-git-send-email-david@tethera.net>
\r
33 References: <1466954985-25761-1-git-send-email-david@tethera.net>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.20
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Sun, 26 Jun 2016 15:30:06 -0000
\r
48 This support will be present only if the appropriate version of xapian
\r
49 is available _and_ the user did not disable the feature when
\r
50 building. So there really needs to be some way for the user to check.
\r
52 lib/built-with.c | 2 ++
\r
53 notmuch-config.c | 3 +++
\r
54 test/T030-config.sh | 1 +
\r
55 test/T040-setup.sh | 3 ++-
\r
56 4 files changed, 8 insertions(+), 1 deletion(-)
\r
58 diff --git a/lib/built-with.c b/lib/built-with.c
\r
59 index 635ed3b..2f1f0b5 100644
\r
60 --- a/lib/built-with.c
\r
61 +++ b/lib/built-with.c
\r
62 @@ -28,6 +28,8 @@ notmuch_built_with (const char *name)
\r
63 return HAVE_XAPIAN_COMPACT;
\r
64 } else if (STRNCMP_LITERAL (name, "field_processor") == 0) {
\r
65 return HAVE_XAPIAN_FIELD_PROCESSOR;
\r
66 + } else if (STRNCMP_LITERAL (name, "retry_lock") == 0) {
\r
67 + return HAVE_XAPIAN_DB_RETRY_LOCK;
\r
71 diff --git a/notmuch-config.c b/notmuch-config.c
\r
72 index de9a8a4..e5d42a0 100644
\r
73 --- a/notmuch-config.c
\r
74 +++ b/notmuch-config.c
\r
75 @@ -911,6 +911,9 @@ _notmuch_config_list_built_with ()
\r
76 printf("%sfield_processor=%s\n",
\r
78 notmuch_built_with ("field_processor") ? "true" : "false");
\r
79 + printf("%sretry_lock=%s\n",
\r
80 + BUILT_WITH_PREFIX,
\r
81 + notmuch_built_with ("retry_lock") ? "true" : "false");
\r
85 diff --git a/test/T030-config.sh b/test/T030-config.sh
\r
86 index b8d5a86..0915abd 100755
\r
87 --- a/test/T030-config.sh
\r
88 +++ b/test/T030-config.sh
\r
89 @@ -59,6 +59,7 @@ foo.string=this is another string value
\r
90 foo.list=this;is another;list value;
\r
91 built_with.compact=something
\r
92 built_with.field_processor=something
\r
93 +built_with.retry_lock=something
\r
95 test_expect_equal_file EXPECTED OUTPUT
\r
97 diff --git a/test/T040-setup.sh b/test/T040-setup.sh
\r
98 index be2f0db..021f2d0 100755
\r
99 --- a/test/T040-setup.sh
\r
100 +++ b/test/T040-setup.sh
\r
101 @@ -31,6 +31,7 @@ search.exclude_tags=baz;
\r
102 maildir.synchronize_flags=true
\r
103 crypto.gpg_path=gpg
\r
104 built_with.compact=something
\r
105 -built_with.field_processor=something"
\r
106 +built_with.field_processor=something
\r
107 +built_with.retry_lock=something"
\r