ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build-sys: simplify python detection 

This allows './configure --enable-most-builds' and 'make distcheck' to
work when both python2 and python3 are installed, and user has set python
version preference using symlink and PATH order.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2013-09-29 10:51:13 +01:00 committed by Karel Zak
parent 2b8f22bd90
commit 0b567ae550
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -1421,20 +1421,14 @@ AS_IF([test "x$with_python" != xno], [
# (minimal version is 2) but if major version is explicitly specified by
# --with-python=2 or --with-python=3 then we look for PKG module "python2" or
# "python3".
pymajor="2"
modname="python"
AS_IF([test "x$withval" != xno -a "x$withval" != xyes], [
pymajor="$withval"
modname="python${pymajor}"
])
PKG_CHECK_MODULES(PYTHON,[${modname} >= $pymajor],
[have_python=yes
AM_PATH_PYTHON([$pymajor])],
[have_python=no])
AS_IF([test "x$withval" != xno -a "x$withval" != xyes],
[pymajor="$withval"; PYTHON=python${pymajor}], [pymajor="2"])
AM_PATH_PYTHON([$pymajor], [have_python=yes], [have_python=no])
AS_CASE([$with_python:$have_python],
[yes:no],
[AC_MSG_ERROR([python selected but libpython not found])],
[AC_MSG_ERROR([python selected but libpython not found])]
)
PKG_CHECK_MODULES([PYTHON], [python-$PYTHON_VERSION])
UL_BUILD_INIT([pylibmount], [check])
UL_REQUIRES_HAVE([pylibmount], [python], [libpython])
@ -1576,7 +1570,8 @@ AC_MSG_RESULT([
ldflags: ${LDFLAGS}
suid ldflags: ${SUID_LDFLAGS}
Python: ${PYTHON_VERSION}
Python: ${PYTHON}
Python version: ${PYTHON_VERSION}
Python libs: ${pyexecdir}
Bash completions: ${with_bashcompletiondir}