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 F41526DE00D1
\r
6 for <notmuch@notmuchmail.org>; Sun, 20 Mar 2016 18:55:41 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.029 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.018, 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 WYMM6Yvn0gPG for <notmuch@notmuchmail.org>;
\r
17 Sun, 20 Mar 2016 18:55:33 -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 9063A6DE00CE
\r
20 for <notmuch@notmuchmail.org>; Sun, 20 Mar 2016 18:55:33 -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 1ahp4g-0002SN-PT; Sun, 20 Mar 2016 21:56:06 -0400
\r
24 Received: (nullmailer pid 31349 invoked by uid 1000);
\r
25 Mon, 21 Mar 2016 01:55:28 -0000
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [PATCH] configure: check directly for xapian compaction API
\r
29 Date: Sun, 20 Mar 2016 22:55:14 -0300
\r
30 Message-Id: <1458525314-31295-1-git-send-email-david@tethera.net>
\r
31 X-Mailer: git-send-email 2.7.0
\r
32 In-Reply-To: <1458437904-17677-3-git-send-email-david@tethera.net>
\r
33 References: <1458437904-17677-3-git-send-email-david@tethera.net>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.20
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Mon, 21 Mar 2016 01:55:42 -0000
\r
48 This is consistent with the check for FieldProcessor, and probably a bit
\r
52 This is really an independent cleanup, but it will probably not apply
\r
53 cleanly without the rest of the series because of code movement.
\r
55 configure | 21 +++++++++++----------
\r
56 1 file changed, 11 insertions(+), 10 deletions(-)
\r
58 diff --git a/configure b/configure
\r
59 index c48f7ce..03f28d5 100755
\r
62 @@ -359,17 +359,18 @@ fi
\r
63 have_xapian_compact=0
\r
64 have_xapian_field_processor=0
\r
65 if [ ${have_xapian} = "1" ]; then
\r
66 - # Compaction is only supported on Xapian > 1.2.6
\r
67 printf "Checking for Xapian compaction support... "
\r
68 - case "${xapian_version}" in
\r
69 - 0.*|1.[01].*|1.2.[0-5])
\r
70 - printf "No (only available with Xapian > 1.2.6).\n" ;;
\r
71 - [1-9]*.[0-9]*.[0-9]*)
\r
72 - have_xapian_compact=1
\r
73 - printf "Yes.\n" ;;
\r
75 - printf "Unknown version.\n" ;;
\r
77 + cat>_compact.cc<<EOF
\r
78 +#include <xapian.h>
\r
79 +class TestCompactor : public Xapian::Compactor { };
\r
81 + if ${CXX} ${CXXLAGS} ${xapian_cxxflags} -c _compact.cc -o _compact.o > /dev/null 2>&1
\r
83 + have_xapian_compact=1
\r
89 printf "Checking for Xapian FieldProcessor API... "
\r
90 cat>_field_processor.cc<<EOF
\r