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

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