1 Return-Path: <bremner@tethera.net>
\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 888F06DE0243
\r
6 for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:29:51 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]
\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 pqAmOVx4kamm for <notmuch@notmuchmail.org>;
\r
17 Sat, 4 Jun 2016 05:29:42 -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 830E46DE0159
\r
20 for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:29:34 -0700 (PDT)
\r
21 Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
\r
22 (envelope-from <bremner@tethera.net>)
\r
23 id 1b9Ahb-0004yp-Rw; Sat, 04 Jun 2016 08:29:19 -0400
\r
24 Received: (nullmailer pid 23497 invoked by uid 1000);
\r
25 Sat, 04 Jun 2016 12:29:27 -0000
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: Istvan Marko <notmuch@kismala.com>, Jani Nikula <jani@nikula.org>,
\r
28 notmuch@notmuchmail.org
\r
29 Subject: [PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK
\r
30 Date: Sat, 4 Jun 2016 09:29:16 -0300
\r
31 Message-Id: <1465043356-23420-5-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 2.8.1
\r
33 In-Reply-To: <1465043356-23420-1-git-send-email-david@tethera.net>
\r
34 References: <m3wpnb0xc6.fsf@zsu.kismala.com>
\r
35 <1465043356-23420-1-git-send-email-david@tethera.net>
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.20
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Sat, 04 Jun 2016 12:29:51 -0000
\r
50 Currently building with DB_RETRY_LOCK is dependent on xapian version,
\r
51 but I can imagine a configure switch to turn it off.
\r
53 lib/built-with.c | 2 ++
\r
54 notmuch-config.c | 3 +++
\r
55 2 files changed, 5 insertions(+)
\r
57 diff --git a/lib/built-with.c b/lib/built-with.c
\r
58 index 7ea1d7f..9dd9e2d 100644
\r
59 --- a/lib/built-with.c
\r
60 +++ b/lib/built-with.c
\r
61 @@ -28,6 +28,8 @@ notmuch_built_with (const char *name)
\r
62 return HAVE_XAPIAN_COMPACT;
\r
63 } else if (STRNCMP_LITERAL (name, "field_processor") == 0) {
\r
64 return HAVE_XAPIAN_FIELD_PROCESSOR;
\r
65 + } else if (STRNCMP_LITERAL (name, "retry_lock") == 0) {
\r
66 + return HAVE_XAPIAN_DB_RETRY_LOCK;
\r
70 diff --git a/notmuch-config.c b/notmuch-config.c
\r
71 index c618f2c..16eaac9 100644
\r
72 --- a/notmuch-config.c
\r
73 +++ b/notmuch-config.c
\r
74 @@ -911,6 +911,9 @@ _notmuch_config_list_built_with ()
\r
75 printf("%sfield_processor=%s\n",
\r
77 notmuch_built_with ("field_processor") ? "true" : "false");
\r
78 + printf("%sretry_lock=%s\n",
\r
79 + BUILT_WITH_PREFIX,
\r
80 + notmuch_built_with ("retry_lock") ? "true" : "false");
\r