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 BB20C6DE00B7
\r
6 for <notmuch@notmuchmail.org>; Sat, 19 Mar 2016 18:38:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.03 tagged_above=-999 required=5 tests=[AWL=-0.019,
\r
12 SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 KDkR0OxqadY7 for <notmuch@notmuchmail.org>;
\r
16 Sat, 19 Mar 2016 18:38:49 -0700 (PDT)
\r
17 Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
\r
18 by arlo.cworth.org (Postfix) with ESMTPS id 169FF6DE00B8
\r
19 for <notmuch@notmuchmail.org>; Sat, 19 Mar 2016 18:38:38 -0700 (PDT)
\r
20 Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
\r
21 (envelope-from <bremner@tethera.net>)
\r
22 id 1ahSKl-0001Vo-1Y; Sat, 19 Mar 2016 21:39:11 -0400
\r
23 Received: (nullmailer pid 17756 invoked by uid 1000);
\r
24 Sun, 20 Mar 2016 01:38:32 -0000
\r
25 From: David Bremner <david@tethera.net>
\r
26 To: notmuch@notmuchmail.org
\r
27 Subject: [PATCH 1/3] config: autodetect xapian-1.3
\r
28 Date: Sat, 19 Mar 2016 22:38:22 -0300
\r
29 Message-Id: <1458437904-17677-2-git-send-email-david@tethera.net>
\r
30 X-Mailer: git-send-email 2.7.0
\r
31 In-Reply-To: <1458437904-17677-1-git-send-email-david@tethera.net>
\r
32 References: <1458437904-17677-1-git-send-email-david@tethera.net>
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.20
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Sun, 20 Mar 2016 01:38:56 -0000
\r
47 Mimic the handling of python2 versus python3. In particular if both
\r
48 xapian-config and xapian-config-1.3 are found, use xapian-config
\r
51 1 file changed, 2 insertions(+), 2 deletions(-)
\r
53 diff --git a/configure b/configure
\r
54 index a79f6bd..eb6dbac 100755
\r
57 @@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-}
\r
58 CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
\r
59 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
\r
60 LDFLAGS=${LDFLAGS:-}
\r
61 -XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
\r
62 +XAPIAN_CONFIG=${XAPIAN_CONFIG:-}
\r
65 # We don't allow the EMACS or GZIP Makefile variables inherit values
\r
66 @@ -341,7 +341,7 @@ fi
\r
68 printf "Checking for Xapian development files... "
\r
70 -for xapian_config in ${XAPIAN_CONFIG}; do
\r
71 +for xapian_config in ${XAPIAN_CONFIG} xapian-config xapian-config-1.3; do
\r
72 if ${xapian_config} --version > /dev/null 2>&1; then
\r
73 xapian_version=$(${xapian_config} --version | sed -e 's/.* //')
\r
74 printf "Yes (%s).\n" ${xapian_version}
\r