From cc6570d37d6c03ef7b1a7e1be0c1de2e7541aa8e Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Sun, 27 Mar 2016 14:57:11 +2100
Subject: [PATCH] [Patch v2 01/13] configure: autodetect xapian-1.3

---
 03/c06a7bd9722de17ee595e49ed9e0ec22d2f7da | 77 +++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 03/c06a7bd9722de17ee595e49ed9e0ec22d2f7da

diff --git a/03/c06a7bd9722de17ee595e49ed9e0ec22d2f7da b/03/c06a7bd9722de17ee595e49ed9e0ec22d2f7da
new file mode 100644
index 000000000..da9ed8e6b
--- /dev/null
+++ b/03/c06a7bd9722de17ee595e49ed9e0ec22d2f7da
@@ -0,0 +1,77 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>
+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 481896DE02D4
+ for <notmuch@notmuchmail.org>; Sat, 26 Mar 2016 11:24:04 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: -0.02
+X-Spam-Level: 
+X-Spam-Status: No, score=-0.02 tagged_above=-999 required=5 tests=[AWL=-0.021,
+  HEADER_FROM_DIFFERENT_DOMAINS=0.001] 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 11CZd6-oP4jI for <notmuch@notmuchmail.org>;
+ Sat, 26 Mar 2016 11:23:56 -0700 (PDT)
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
+ by arlo.cworth.org (Postfix) with ESMTPS id 52A3C6DE02D1
+ for <notmuch@notmuchmail.org>; Sat, 26 Mar 2016 11:23:24 -0700 (PDT)
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
+ (envelope-from <bremner@tesseract.cs.unb.ca>)
+ id 1ajsTW-0000vE-5D; Sat, 26 Mar 2016 13:58:14 -0400
+Received: (nullmailer pid 8804 invoked by uid 1000);
+ Sat, 26 Mar 2016 17:57:27 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [Patch v2 01/13] configure: autodetect xapian-1.3
+Date: Sat, 26 Mar 2016 14:57:11 -0300
+Message-Id: <1459015043-8460-2-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 2.6.4
+In-Reply-To: <1459015043-8460-1-git-send-email-david@tethera.net>
+References: <1459015043-8460-1-git-send-email-david@tethera.net>
+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: Sat, 26 Mar 2016 18:24:04 -0000
+
+Mimic the handling of python2 versus python3. In particular if both
+xapian-config and xapian-config-1.3 are found, use xapian-config
+---
+ 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