[PATCH] configure: check directly for xapian compaction API

diff --git a/cb/37ba6963356ef2e8a5bca5eeca19eb7ff2b287 b/cb/37ba6963356ef2e8a5bca5eeca19eb7ff2b287
new file mode 100644 (file)
index 0000000..84ec68d
--- /dev/null
+++ b/cb/37ba6963356ef2e8a5bca5eeca19eb7ff2b287
@@ -0,0 +1,93 @@
+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 F41526DE00D1\r
+ for <notmuch@notmuchmail.org>; Sun, 20 Mar 2016 18:55:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.029\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.029 tagged_above=-999 required=5\r
+ tests=[AWL=-0.018, 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 WYMM6Yvn0gPG for <notmuch@notmuchmail.org>;\r
+ Sun, 20 Mar 2016 18:55:33 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 9063A6DE00CE\r
+ for <notmuch@notmuchmail.org>; Sun, 20 Mar 2016 18:55:33 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1ahp4g-0002SN-PT; Sun, 20 Mar 2016 21:56:06 -0400\r
+Received: (nullmailer pid 31349 invoked by uid 1000);\r
+ Mon, 21 Mar 2016 01:55:28 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] configure: check directly for xapian compaction API\r
+Date: Sun, 20 Mar 2016 22:55:14 -0300\r
+Message-Id: <1458525314-31295-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.7.0\r
+In-Reply-To: <1458437904-17677-3-git-send-email-david@tethera.net>\r
+References: <1458437904-17677-3-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: Mon, 21 Mar 2016 01:55:42 -0000\r
+\r
+This is consistent with the check for FieldProcessor, and probably a bit\r
+more robust.\r
+---\r
+\r
+This is really an independent cleanup, but it will probably not apply\r
+cleanly without the rest of the series because of code movement.\r
+\r
+ configure | 21 +++++++++++----------\r
+ 1 file changed, 11 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index c48f7ce..03f28d5 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -359,17 +359,18 @@ fi\r
+ have_xapian_compact=0\r
+ have_xapian_field_processor=0\r
+ if [ ${have_xapian} = "1" ]; then\r
+-    # Compaction is only supported on Xapian > 1.2.6\r
+     printf "Checking for Xapian compaction support... "\r
+-    case "${xapian_version}" in\r
+-      0.*|1.[01].*|1.2.[0-5])\r
+-          printf "No (only available with Xapian > 1.2.6).\n" ;;\r
+-      [1-9]*.[0-9]*.[0-9]*)\r
+-          have_xapian_compact=1\r
+-          printf "Yes.\n" ;;\r
+-      *)\r
+-          printf "Unknown version.\n" ;;\r
+-    esac\r
++    cat>_compact.cc<<EOF\r
++#include <xapian.h>\r
++class TestCompactor : public Xapian::Compactor { };\r
++EOF\r
++    if ${CXX} ${CXXLAGS} ${xapian_cxxflags} -c _compact.cc -o _compact.o > /dev/null 2>&1\r
++    then\r
++      have_xapian_compact=1\r
++      printf "Yes.\n"\r
++    else\r
++      printf "No.\n"\r
++    fi\r
+ \r
+     printf "Checking for Xapian FieldProcessor API... "\r
+     cat>_field_processor.cc<<EOF\r
+-- \r
+2.7.0\r
+\r