From ede85de35ae988fcc68152ec4c679644d60633fd Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 3 Jan 2015 13:58:19 +0100 Subject: [PATCH] [PATCH 1/2] configure: add check for python interepreter name --- 2e/2e89fa6eb61fa76bbf3c579802db7b478bdf3f | 115 ++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 2e/2e89fa6eb61fa76bbf3c579802db7b478bdf3f diff --git a/2e/2e89fa6eb61fa76bbf3c579802db7b478bdf3f b/2e/2e89fa6eb61fa76bbf3c579802db7b478bdf3f new file mode 100644 index 000000000..5e93b1a97 --- /dev/null +++ b/2e/2e89fa6eb61fa76bbf3c579802db7b478bdf3f @@ -0,0 +1,115 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 77955431FBC + for ; Sat, 3 Jan 2015 04:58:49 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id yYshOHJCJB3n for ; + Sat, 3 Jan 2015 04:58:45 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id CFC6A431FB6 + for ; Sat, 3 Jan 2015 04:58:45 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1Y7OI0-0006EP-MZ; Sat, 03 Jan 2015 08:58:44 -0400 +Received: (nullmailer pid 29779 invoked by uid 1000); Sat, 03 Jan 2015 + 12:58:38 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] configure: add check for python interepreter name +Date: Sat, 3 Jan 2015 13:58:19 +0100 +Message-Id: <1420289900-29717-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.3 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Sat, 03 Jan 2015 12:58:49 -0000 + +Currently we hardcode "python" in several places. This makes things +hard for people who have only commands called python3 and/or +python2. We also add the name to sh.config to eventually replace the +current workaround in the test suite. +--- + configure | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/configure b/configure +index d14e7d1..5a02de4 100755 +--- a/configure ++++ b/configure +@@ -374,6 +374,23 @@ else + errors=$((errors + 1)) + fi + ++printf "Checking for python... " ++have_python=0 ++ ++for name in python python2 python3; do ++ if command -v $name > /dev/null 2>&1; then ++ have_python=1 ++ python=$name ++ printf "Yes: $name.\n" ++ break ++ fi ++done ++ ++if [ $have_python -eq 0 ]; then ++ printf "No.\n" ++ errors=$((errors + 1)) ++fi ++ + printf "Checking for valgrind development files... " + if pkg-config --exists valgrind; then + printf "Yes.\n" +@@ -522,6 +539,9 @@ need to install the following packages before being able to compile + notmuch: + + EOF ++ if [ $have_python -eq 0 ]; then ++ echo " python interpreter" ++ fi + if [ $have_xapian -eq 0 ]; then + echo " Xapian library (including development files such as headers)" + echo " http://xapian.org/" +@@ -787,6 +807,9 @@ WARN_CXXFLAGS=${WARN_CXXFLAGS} + # Flags to enable warnings when using the C compiler + WARN_CFLAGS=${WARN_CFLAGS} + ++# Name of python interpreter ++PYTHON = ${python} ++ + # The prefix to which notmuch should be installed + # Note: If you change this value here, be sure to ensure that the + # LIBDIR_IN_LDCONFIG value below is still set correctly. +@@ -958,6 +981,9 @@ NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact} + # Whether there's either sphinx or rst2man available for building + # documentation + NOTMUCH_HAVE_MAN=$((have_sphinx || have_rst2man)) ++ ++# Name of python interpreter ++NOTMUCH_PYTHON=${python} + EOF + + # Finally, after everything configured, inform the user how to continue. +-- +2.1.3 + -- 2.26.2