[PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK

diff --git a/6a/c5609630305bf81d7a69265399b125ff7266a0 b/6a/c5609630305bf81d7a69265399b125ff7266a0
new file mode 100644 (file)
index 0000000..22fc3ff
--- /dev/null
+++ b/6a/c5609630305bf81d7a69265399b125ff7266a0
@@ -0,0 +1,86 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 888F06DE0243\r
+ for <notmuch@notmuchmail.org>; Sat,  4 Jun 2016 05:29:51 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.012\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5\r
+ tests=[AWL=-0.001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id pqAmOVx4kamm for <notmuch@notmuchmail.org>;\r
+ Sat,  4 Jun 2016 05:29:42 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 830E46DE0159\r
+ for <notmuch@notmuchmail.org>; Sat,  4 Jun 2016 05:29:34 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1b9Ahb-0004yp-Rw; Sat, 04 Jun 2016 08:29:19 -0400\r
+Received: (nullmailer pid 23497 invoked by uid 1000);\r
+ Sat, 04 Jun 2016 12:29:27 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Istvan Marko <notmuch@kismala.com>, Jani Nikula <jani@nikula.org>,\r
+ notmuch@notmuchmail.org\r
+Subject: [PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK\r
+Date: Sat,  4 Jun 2016 09:29:16 -0300\r
+Message-Id: <1465043356-23420-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1465043356-23420-1-git-send-email-david@tethera.net>\r
+References: <m3wpnb0xc6.fsf@zsu.kismala.com>\r
+ <1465043356-23420-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 04 Jun 2016 12:29:51 -0000\r
+\r
+Currently building with DB_RETRY_LOCK is dependent on xapian version,\r
+but I can imagine a configure switch to turn it off.\r
+---\r
+ lib/built-with.c | 2 ++\r
+ notmuch-config.c | 3 +++\r
+ 2 files changed, 5 insertions(+)\r
+\r
+diff --git a/lib/built-with.c b/lib/built-with.c\r
+index 7ea1d7f..9dd9e2d 100644\r
+--- a/lib/built-with.c\r
++++ b/lib/built-with.c\r
+@@ -28,6 +28,8 @@ notmuch_built_with (const char *name)\r
+       return HAVE_XAPIAN_COMPACT;\r
+     } else if (STRNCMP_LITERAL (name, "field_processor") == 0) {\r
+       return HAVE_XAPIAN_FIELD_PROCESSOR;\r
++    } else if (STRNCMP_LITERAL (name, "retry_lock") == 0) {\r
++      return HAVE_XAPIAN_DB_RETRY_LOCK;\r
+     } else {\r
+       return FALSE;\r
+     }\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index c618f2c..16eaac9 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -911,6 +911,9 @@ _notmuch_config_list_built_with ()\r
+     printf("%sfield_processor=%s\n",\r
+          BUILT_WITH_PREFIX,\r
+          notmuch_built_with ("field_processor") ? "true" : "false");\r
++    printf("%sretry_lock=%s\n",\r
++         BUILT_WITH_PREFIX,\r
++         notmuch_built_with ("retry_lock") ? "true" : "false");\r
+ }\r
+ \r
+ static int\r
+-- \r
+2.8.1\r
+\r