--- /dev/null
+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 CD9316DE02C3\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:39:13 -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 qFQ0C68sN4Jj for <notmuch@notmuchmail.org>;\r
+ Sat, 4 Jun 2016 05:39:06 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 1F5986DE02C2\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:39:06 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1b9Aqr-00057V-J0; Sat, 04 Jun 2016 08:38:53 -0400\r
+Received: (nullmailer pid 15698 invoked by uid 1000);\r
+ Sat, 04 Jun 2016 12:39:03 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, Istvan Marko <notmuch@kismala.com>,\r
+ Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: [PATCH] fixup! lib: add built_with handling for XAPIAN_DB_RETRY_LOCK\r
+Date: Sat, 4 Jun 2016 09:38:56 -0300\r
+Message-Id: <1465043936-15657-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1465043356-23420-5-git-send-email-david@tethera.net>\r
+References: <1465043356-23420-5-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:39:13 -0000\r
+\r
+---\r
+ test/T030-config.sh | 1 +\r
+ test/T040-setup.sh | 3 ++-\r
+ 2 files changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/T030-config.sh b/test/T030-config.sh\r
+index b8d5a86..0915abd 100755\r
+--- a/test/T030-config.sh\r
++++ b/test/T030-config.sh\r
+@@ -59,6 +59,7 @@ foo.string=this is another string value\r
+ foo.list=this;is another;list value;\r
+ built_with.compact=something\r
+ built_with.field_processor=something\r
++built_with.retry_lock=something\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+diff --git a/test/T040-setup.sh b/test/T040-setup.sh\r
+index be2f0db..021f2d0 100755\r
+--- a/test/T040-setup.sh\r
++++ b/test/T040-setup.sh\r
+@@ -31,6 +31,7 @@ search.exclude_tags=baz;\r
+ maildir.synchronize_flags=true\r
+ crypto.gpg_path=gpg\r
+ built_with.compact=something\r
+-built_with.field_processor=something"\r
++built_with.field_processor=something\r
++built_with.retry_lock=something"\r
+ \r
+ test_done\r
+-- \r
+2.8.1\r
+\r