From 55816631dc0ad235635c1107b80367e5cfcccbcb Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 1 Apr 2016 12:09:52 +0300
Subject: [PATCH] Re: [Patch v2 01/13] configure: autodetect xapian-1.3

---
 be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b | 86 +++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b

diff --git a/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b b/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b
new file mode 100644
index 000000000..f2dd62651
--- /dev/null
+++ b/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b
@@ -0,0 +1,86 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+ by arlo.cworth.org (Postfix) with ESMTP id 91B486DE02CA
+ for <notmuch@notmuchmail.org>; Fri,  1 Apr 2016 02:09:47 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: 0.626
+X-Spam-Level: 
+X-Spam-Status: No, score=0.626 tagged_above=-999 required=5 tests=[AWL=-0.026,
+  SPF_NEUTRAL=0.652] autolearn=disabled
+Received: from arlo.cworth.org ([127.0.0.1])
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id o6lPJAR28FUz for <notmuch@notmuchmail.org>;
+ Fri,  1 Apr 2016 02:09:39 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+ by arlo.cworth.org (Postfix) with ESMTP id CBBF56DE014A
+ for <notmuch@notmuchmail.org>; Fri,  1 Apr 2016 02:09:38 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+ by guru.guru-group.fi (Postfix) with ESMTP id A36E31000B3;
+ Fri,  1 Apr 2016 12:09:52 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
+Subject: Re: [Patch v2 01/13] configure: autodetect xapian-1.3
+In-Reply-To: <1459015043-8460-2-git-send-email-david@tethera.net>
+References: <1459015043-8460-1-git-send-email-david@tethera.net>
+ <1459015043-8460-2-git-send-email-david@tethera.net>
+User-Agent: Notmuch/0.21+99~g7cbc880 (http://notmuchmail.org) Emacs/24.3.1
+ (x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Fri, 01 Apr 2016 12:09:52 +0300
+Message-ID: <m2bn5tr8yn.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.20
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+ <notmuch.notmuchmail.org>
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Fri, 01 Apr 2016 09:09:47 -0000
+
+On Sat, Mar 26 2016, David Bremner <david@tethera.net> wrote:
+
+> Mimic the handling of python2 versus python3. In particular if both
+> xapian-config and xapian-config-1.3 are found, use xapian-config
+
++1 (this change)
+
+> ---
+>  configure | 4 ++--
+>  1 file changed, 2 insertions(+), 2 deletions(-)
+>
+> diff --git a/configure b/configure
+> index a79f6bd..eb6dbac 100755
+> --- a/configure
+> +++ b/configure
+> @@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-}
+>  CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
+>  CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
+>  LDFLAGS=${LDFLAGS:-}
+> -XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
+> +XAPIAN_CONFIG=${XAPIAN_CONFIG:-}
+>  PYTHON=${PYTHON:-}
+>  
+>  # We don't allow the EMACS or GZIP Makefile variables inherit values
+> @@ -341,7 +341,7 @@ fi
+>  
+>  printf "Checking for Xapian development files... "
+>  have_xapian=0
+> -for xapian_config in ${XAPIAN_CONFIG}; do
+> +for xapian_config in ${XAPIAN_CONFIG} xapian-config xapian-config-1.3; do
+>      if ${xapian_config} --version > /dev/null 2>&1; then
+>  	xapian_version=$(${xapian_config} --version | sed -e 's/.* //')
+>  	printf "Yes (%s).\n" ${xapian_version}
+> -- 
+> 2.6.4
-- 
2.26.2