Return-Path: 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 ; 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 ; 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 ; 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 To: David Bremner , 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~ 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." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Apr 2016 09:09:47 -0000 On Sat, Mar 26 2016, David Bremner 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