[PATCH 1/3] config: autodetect xapian-1.3

diff --git a/24/a7c8f2927516af0bb3510c229ee03f544bba30 b/24/a7c8f2927516af0bb3510c229ee03f544bba30
new file mode 100644 (file)
index 0000000..31ce866
--- /dev/null
+++ b/24/a7c8f2927516af0bb3510c229ee03f544bba30
@@ -0,0 +1,77 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id BB20C6DE00B7\r
+ for <notmuch@notmuchmail.org>; Sat, 19 Mar 2016 18:38:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.03\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.03 tagged_above=-999 required=5 tests=[AWL=-0.019,\r
+  SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id KDkR0OxqadY7 for <notmuch@notmuchmail.org>;\r
+ Sat, 19 Mar 2016 18:38:49 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 169FF6DE00B8\r
+ for <notmuch@notmuchmail.org>; Sat, 19 Mar 2016 18:38:38 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1ahSKl-0001Vo-1Y; Sat, 19 Mar 2016 21:39:11 -0400\r
+Received: (nullmailer pid 17756 invoked by uid 1000);\r
+ Sun, 20 Mar 2016 01:38:32 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] config: autodetect xapian-1.3\r
+Date: Sat, 19 Mar 2016 22:38:22 -0300\r
+Message-Id: <1458437904-17677-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.7.0\r
+In-Reply-To: <1458437904-17677-1-git-send-email-david@tethera.net>\r
+References: <1458437904-17677-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 20 Mar 2016 01:38:56 -0000\r
+\r
+Mimic the handling of python2 versus python3. In particular if both\r
+xapian-config and xapian-config-1.3 are found, use xapian-config\r
+---\r
+ configure | 4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index a79f6bd..eb6dbac 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-}\r
+ CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}\r
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}\r
+ LDFLAGS=${LDFLAGS:-}\r
+-XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}\r
++XAPIAN_CONFIG=${XAPIAN_CONFIG:-}\r
+ PYTHON=${PYTHON:-}\r
+ \r
+ # We don't allow the EMACS or GZIP Makefile variables inherit values\r
+@@ -341,7 +341,7 @@ fi\r
+ \r
+ printf "Checking for Xapian development files... "\r
+ have_xapian=0\r
+-for xapian_config in ${XAPIAN_CONFIG}; do\r
++for xapian_config in ${XAPIAN_CONFIG} xapian-config xapian-config-1.3; do\r
+     if ${xapian_config} --version > /dev/null 2>&1; then\r
+       xapian_version=$(${xapian_config} --version | sed -e 's/.* //')\r
+       printf "Yes (%s).\n" ${xapian_version}\r
+-- \r
+2.7.0\r
+\r