From ff03dc74ea0be00d79136891dfda6dba3d7336fc Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 5 Jun 2016 09:29:16 +2100 Subject: [PATCH] [PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK --- 6a/c5609630305bf81d7a69265399b125ff7266a0 | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 6a/c5609630305bf81d7a69265399b125ff7266a0 diff --git a/6a/c5609630305bf81d7a69265399b125ff7266a0 b/6a/c5609630305bf81d7a69265399b125ff7266a0 new file mode 100644 index 000000000..22fc3ff3a --- /dev/null +++ b/6a/c5609630305bf81d7a69265399b125ff7266a0 @@ -0,0 +1,86 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 888F06DE0243 + for ; Sat, 4 Jun 2016 05:29:51 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.012 +X-Spam-Level: +X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5 + tests=[AWL=-0.001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id pqAmOVx4kamm for ; + Sat, 4 Jun 2016 05:29:42 -0700 (PDT) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 830E46DE0159 + for ; Sat, 4 Jun 2016 05:29:34 -0700 (PDT) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1b9Ahb-0004yp-Rw; Sat, 04 Jun 2016 08:29:19 -0400 +Received: (nullmailer pid 23497 invoked by uid 1000); + Sat, 04 Jun 2016 12:29:27 -0000 +From: David Bremner +To: Istvan Marko , Jani Nikula , + notmuch@notmuchmail.org +Subject: [PATCH 4/4] lib: add built_with handling for XAPIAN_DB_RETRY_LOCK +Date: Sat, 4 Jun 2016 09:29:16 -0300 +Message-Id: <1465043356-23420-5-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.8.1 +In-Reply-To: <1465043356-23420-1-git-send-email-david@tethera.net> +References: + <1465043356-23420-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 04 Jun 2016 12:29:51 -0000 + +Currently building with DB_RETRY_LOCK is dependent on xapian version, +but I can imagine a configure switch to turn it off. +--- + lib/built-with.c | 2 ++ + notmuch-config.c | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/lib/built-with.c b/lib/built-with.c +index 7ea1d7f..9dd9e2d 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 c618f2c..16eaac9 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 +-- +2.8.1 + -- 2.26.2