[Pkg-gnupg-commit] [gpgme] 98/132: build: Improve Python detection.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit 6a371663886a7ba6073f385a3ab5f5a03de8e008
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 13 15:37:15 2017 +0100

    build: Improve Python detection.
    
    * configure.ac: Do not error out too early if we don't find a matching
    Python version.  We handle this case later.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 configure.ac | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index ba26901..2701d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,12 +418,13 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then
 	unset am_cv_python_pyexecdir
 
 	if test "$found_py" = "1" -o "$found_py2" = "1"; then
-	    AM_PATH_PYTHON([2.7])
-	    AX_PYTHON_DEVEL
-	    if test "$PYTHON_VERSION"; then
-		PYTHONS="$(echo $PYTHONS $PYTHON)"
-		PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
-	    fi
+	    AM_PATH_PYTHON([2.7], [
+		AX_PYTHON_DEVEL
+		if test "$PYTHON_VERSION"; then
+			PYTHONS="$(echo $PYTHONS $PYTHON)"
+			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+		fi
+	    ], :)
 	fi
 
 	if test "$found_py" = "1" -o "$found_py3" = "1"; then
@@ -441,17 +442,26 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then
 	    unset am_cv_python_platform
 	    unset am_cv_python_pythondir
 	    unset am_cv_python_pyexecdir
-	    AM_PATH_PYTHON([3.4])
-	    AX_PYTHON_DEVEL
-	    if test "$PYTHON_VERSION"; then
-		PYTHONS="$(echo $PYTHONS $PYTHON)"
-		PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
-	    fi
+	    AM_PATH_PYTHON([3.4], [
+		AX_PYTHON_DEVEL
+		if test "$PYTHON_VERSION"; then
+			PYTHONS="$(echo $PYTHONS $PYTHON)"
+			PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
+		fi
+	    ], :)
 	fi
 
+	# Recover some values lost in the second attempt to find Python.
+	PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)"
+	PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)"
+
+	# Remove duplicates.
+	PYTHONS="$(echo $PYTHONS | tr '[[:space:]]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
+	PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS | tr '[[:space:]]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
+
 	if test "$PYTHON_VERSIONS"; then
-	   enabled_languages_v=$(echo $enabled_languages | sed "s/python\([[23]]\)\?/python ($PYTHON_VERSIONS)/")
-	   enabled_languages=$(echo $enabled_languages | sed "s/python\([[23]]\)\?/python/")
+	   enabled_languages_v=$(echo $enabled_languages | sed -Ee "s/python[[23]]?/python ($PYTHON_VERSIONS)/")
+	   enabled_languages=$(echo $enabled_languages | sed -Ee "s/python[[23]]?/python/")
 	else
             if test "$explicit_languages" = "1"; then
                 AC_MSG_ERROR([[

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git