[Pkg-gnupg-commit] [gpgme] 154/412: python: Make Python detection more robust.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu Sep 22 21:26:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gpgme.
commit 1607aa7fe5dd686ba3bfb6de4a2b602d6a458c86
Author: Justus Winter <justus at g10code.com>
Date: Wed Jun 1 15:33:52 2016 +0200
python: Make Python detection more robust.
Previously, missing Python development packages made configure fail
instead of merely disabling the bindings.
* configure.ac: Check for 'PYTHON_VERSION'.
* m4/ax_python_devel.m4: Make test non-fatal.
Signed-off-by: Justus Winter <justus at g10code.com>
---
configure.ac | 10 ++++++++++
m4/ax_python_devel.m4 | 3 +--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7559559..b84b04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,16 @@ if test "$found" = "1"; then
else
AM_PATH_PYTHON([3.3])
AX_SWIG_PYTHON
+ if test -z "$PYTHON_VERSION"; then
+ if test "$explicit_languages" = "1"; then
+ AC_MSG_ERROR([[
+***
+*** Please install the python development packages.
+***]])
+ else
+ enabled_languages=$(echo $enabled_languages | sed 's/python//')
+ fi
+ fi
fi
fi
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index 59a2ff0..de992c8 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -304,13 +304,12 @@ EOD`
AC_MSG_RESULT([$pythonexists])
if test ! "x$pythonexists" = "xyes"; then
- AC_MSG_FAILURE([
+ AC_MSG_WARN([
Could not link test program to Python. Maybe the main Python library has been
installed in some non-standard library path. If so, pass it to configure,
via the LDFLAGS environment variable.
Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
============================================================================
- ERROR!
You probably have to install the development version of the Python package
for your distribution. The exact name of this package varies among them.
============================================================================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list