From e41d4a53eb6e925c673e0733921465bd82b022a1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 20 Mar 2016 22:38:22 +2100 Subject: [PATCH] [PATCH 1/3] config: autodetect xapian-1.3 --- 24/a7c8f2927516af0bb3510c229ee03f544bba30 | 77 +++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 24/a7c8f2927516af0bb3510c229ee03f544bba30 diff --git a/24/a7c8f2927516af0bb3510c229ee03f544bba30 b/24/a7c8f2927516af0bb3510c229ee03f544bba30 new file mode 100644 index 000000000..31ce8665a --- /dev/null +++ b/24/a7c8f2927516af0bb3510c229ee03f544bba30 @@ -0,0 +1,77 @@ +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 BB20C6DE00B7 + for ; Sat, 19 Mar 2016 18:38:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.03 +X-Spam-Level: +X-Spam-Status: No, score=-0.03 tagged_above=-999 required=5 tests=[AWL=-0.019, + SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 KDkR0OxqadY7 for ; + Sat, 19 Mar 2016 18:38:49 -0700 (PDT) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 169FF6DE00B8 + for ; Sat, 19 Mar 2016 18:38:38 -0700 (PDT) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1ahSKl-0001Vo-1Y; Sat, 19 Mar 2016 21:39:11 -0400 +Received: (nullmailer pid 17756 invoked by uid 1000); + Sun, 20 Mar 2016 01:38:32 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 1/3] config: autodetect xapian-1.3 +Date: Sat, 19 Mar 2016 22:38:22 -0300 +Message-Id: <1458437904-17677-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.7.0 +In-Reply-To: <1458437904-17677-1-git-send-email-david@tethera.net> +References: <1458437904-17677-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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 20 Mar 2016 01:38:56 -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.7.0 + -- 2.26.2