1 Return-Path: <tomi.ollila@iki.fi>
\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 91B486DE02CA
\r
6 for <notmuch@notmuchmail.org>; Fri, 1 Apr 2016 02:09:47 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.626 tagged_above=-999 required=5 tests=[AWL=-0.026,
\r
12 SPF_NEUTRAL=0.652] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id o6lPJAR28FUz for <notmuch@notmuchmail.org>;
\r
16 Fri, 1 Apr 2016 02:09:39 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by arlo.cworth.org (Postfix) with ESMTP id CBBF56DE014A
\r
19 for <notmuch@notmuchmail.org>; Fri, 1 Apr 2016 02:09:38 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id A36E31000B3;
\r
22 Fri, 1 Apr 2016 12:09:52 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
25 Subject: Re: [Patch v2 01/13] configure: autodetect xapian-1.3
\r
26 In-Reply-To: <1459015043-8460-2-git-send-email-david@tethera.net>
\r
27 References: <1459015043-8460-1-git-send-email-david@tethera.net>
\r
28 <1459015043-8460-2-git-send-email-david@tethera.net>
\r
29 User-Agent: Notmuch/0.21+99~g7cbc880 (http://notmuchmail.org) Emacs/24.3.1
\r
30 (x86_64-unknown-linux-gnu)
\r
31 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
32 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
33 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
34 Date: Fri, 01 Apr 2016 12:09:52 +0300
\r
35 Message-ID: <m2bn5tr8yn.fsf@guru.guru-group.fi>
\r
37 Content-Type: text/plain
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.20
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Fri, 01 Apr 2016 09:09:47 -0000
\r
52 On Sat, Mar 26 2016, David Bremner <david@tethera.net> wrote:
\r
54 > Mimic the handling of python2 versus python3. In particular if both
\r
55 > xapian-config and xapian-config-1.3 are found, use xapian-config
\r
60 > configure | 4 ++--
\r
61 > 1 file changed, 2 insertions(+), 2 deletions(-)
\r
63 > diff --git a/configure b/configure
\r
64 > index a79f6bd..eb6dbac 100755
\r
67 > @@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-}
\r
68 > CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
\r
69 > CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
\r
70 > LDFLAGS=${LDFLAGS:-}
\r
71 > -XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
\r
72 > +XAPIAN_CONFIG=${XAPIAN_CONFIG:-}
\r
73 > PYTHON=${PYTHON:-}
\r
75 > # We don't allow the EMACS or GZIP Makefile variables inherit values
\r
76 > @@ -341,7 +341,7 @@ fi
\r
78 > printf "Checking for Xapian development files... "
\r
80 > -for xapian_config in ${XAPIAN_CONFIG}; do
\r
81 > +for xapian_config in ${XAPIAN_CONFIG} xapian-config xapian-config-1.3; do
\r
82 > if ${xapian_config} --version > /dev/null 2>&1; then
\r
83 > xapian_version=$(${xapian_config} --version | sed -e 's/.* //')
\r
84 > printf "Yes (%s).\n" ${xapian_version}
\r