Re: [Patch v2 01/13] configure: autodetect xapian-1.3

diff --git a/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b b/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b
new file mode 100644 (file)
index 0000000..f2dd626
--- /dev/null
+++ b/be/832d2c9f9cfdf7e96d5e4845ab59b0dc3f3d8b
@@ -0,0 +1,86 @@
+Return-Path: <tomi.ollila@iki.fi>\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 91B486DE02CA\r
+ for <notmuch@notmuchmail.org>; Fri,  1 Apr 2016 02:09:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.626\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.626 tagged_above=-999 required=5 tests=[AWL=-0.026,\r
+  SPF_NEUTRAL=0.652] 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 o6lPJAR28FUz for <notmuch@notmuchmail.org>;\r
+ Fri,  1 Apr 2016 02:09:39 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id CBBF56DE014A\r
+ for <notmuch@notmuchmail.org>; Fri,  1 Apr 2016 02:09:38 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id A36E31000B3;\r
+ Fri,  1 Apr 2016 12:09:52 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v2 01/13] configure: autodetect xapian-1.3\r
+In-Reply-To: <1459015043-8460-2-git-send-email-david@tethera.net>\r
+References: <1459015043-8460-1-git-send-email-david@tethera.net>\r
+ <1459015043-8460-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.21+99~g7cbc880 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 01 Apr 2016 12:09:52 +0300\r
+Message-ID: <m2bn5tr8yn.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Fri, 01 Apr 2016 09:09:47 -0000\r
+\r
+On Sat, Mar 26 2016, David Bremner <david@tethera.net> wrote:\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
++1 (this change)\r
+\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.6.4\r