From: David Bremner <david@tethera.net>
Date: Sat, 23 May 2015 20:28:45 +0000 (+0200)
Subject: [PATCH 2/4] configure: add ability to force python version via environment
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=272c8d5f6b9d62ba21e213e3846a2ecdc23584d9;p=notmuch-archives.git

[PATCH 2/4] configure: add ability to force python version via environment
---

diff --git a/e2/4e318fdd6a7007cd7c6ddd592816e2969984a0 b/e2/4e318fdd6a7007cd7c6ddd592816e2969984a0
new file mode 100644
index 000000000..8242d9664
--- /dev/null
+++ b/e2/4e318fdd6a7007cd7c6ddd592816e2969984a0
@@ -0,0 +1,78 @@
+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 015796DE15BE
+ for <notmuch@notmuchmail.org>; Sat, 23 May 2015 13:31:00 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: 0.282
+X-Spam-Level: 
+X-Spam-Status: No, score=0.282 tagged_above=-999 required=5 tests=[AWL=0.272, 
+ T_HEADER_FROM_DIFFERENT_DOMAINS=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 Rgy18U_o90Df for <notmuch@notmuchmail.org>;
+ Sat, 23 May 2015 13:30:56 -0700 (PDT)
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net
+ [87.98.215.224])
+ by arlo.cworth.org (Postfix) with ESMTPS id 792606DE1841
+ for <notmuch@notmuchmail.org>; Sat, 23 May 2015 13:30:56 -0700 (PDT)
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)
+ id 1YwG3i-0002rT-J1; Sat, 23 May 2015 20:30:14 +0000
+Received: (nullmailer pid 8763 invoked by uid 1000); Sat, 23 May 2015
+ 20:29:05 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 2/4] configure: add ability to force python version via
+ environment
+Date: Sat, 23 May 2015 22:28:45 +0200
+Message-Id: <1432412927-8373-3-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 2.1.4
+In-Reply-To: <1432412927-8373-1-git-send-email-david@tethera.net>
+References: <1432412927-8373-1-git-send-email-david@tethera.net>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.18
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+ <notmuch.notmuchmail.org>
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sat, 23 May 2015 20:31:00 -0000
+
+This is makes it a bit easier to run our test suite under alternative
+python versions.
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 2065fcd..71eef6c 100755
+--- a/configure
++++ b/configure
+@@ -51,6 +51,7 @@ CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
+ LDFLAGS=${LDFLAGS:-}
+ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
++PYTHON=${PYTHON:-}
+ 
+ # We don't allow the EMACS or GZIP Makefile variables inherit values
+ # from the environment as we do with CC and CXX above. The reason is
+@@ -407,7 +408,7 @@ fi
+ printf "Checking for python... "
+ have_python=0
+ 
+-for name in python python2 python3; do
++for name in ${PYTHON} python python2 python3; do
+     if command -v $name > /dev/null; then
+ 	have_python=1
+ 	python=$name
+-- 
+2.1.4
+