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 80ADC6DE0350
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 May 2016 17:05:45 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.013 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.002, 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 uYilJV7qNiXZ for <notmuch@notmuchmail.org>;
\r
17 Sat, 7 May 2016 17:05:37 -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 225236DE00EB
\r
20 for <notmuch@notmuchmail.org>; Sat, 7 May 2016 17:05:06 -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 1azCDU-00015I-0Q; Sat, 07 May 2016 20:05:00 -0400
\r
24 Received: (nullmailer pid 17189 invoked by uid 1000);
\r
25 Sun, 08 May 2016 00:04:53 -0000
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [Patch v4 04/12] configure: check directly for xapian compaction API
\r
29 Date: Sat, 7 May 2016 21:04:41 -0300
\r
30 Message-Id: <1462665889-17121-5-git-send-email-david@tethera.net>
\r
31 X-Mailer: git-send-email 2.8.1
\r
32 In-Reply-To: <1462665889-17121-1-git-send-email-david@tethera.net>
\r
33 References: <1462665889-17121-1-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: Sun, 08 May 2016 00:05:45 -0000
\r
48 This is consistent with the check for FieldProcessor, and probably a bit
\r
51 configure | 21 +++++++++++----------
\r
52 1 file changed, 11 insertions(+), 10 deletions(-)
\r
54 diff --git a/configure b/configure
\r
55 index 03e4318..f94f7c7 100755
\r
58 @@ -361,17 +361,18 @@ fi
\r
59 have_xapian_compact=0
\r
60 have_xapian_field_processor=0
\r
61 if [ ${have_xapian} = "1" ]; then
\r
62 - # Compaction is only supported on Xapian > 1.2.6
\r
63 printf "Checking for Xapian compaction support... "
\r
64 - case "${xapian_version}" in
\r
65 - 0.*|1.[01].*|1.2.[0-5])
\r
66 - printf "No (only available with Xapian > 1.2.6).\n" ;;
\r
67 - [1-9]*.[0-9]*.[0-9]*)
\r
68 - have_xapian_compact=1
\r
69 - printf "Yes.\n" ;;
\r
71 - printf "Unknown version.\n" ;;
\r
73 + cat>_compact.cc<<EOF
\r
74 +#include <xapian.h>
\r
75 +class TestCompactor : public Xapian::Compactor { };
\r
77 + if ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} -c _compact.cc -o _compact.o > /dev/null 2>&1
\r
79 + have_xapian_compact=1
\r
85 printf "Checking for Xapian FieldProcessor API... "
\r
86 cat>_field_processor.cc<<EOF
\r