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:
parent
2b8f22bd90
commit
0b567ae550
19
configure.ac
19
configure.ac
|
@ -1421,20 +1421,14 @@ AS_IF([test "x$with_python" != xno], [
|
||||||
# (minimal version is 2) but if major version is explicitly specified by
|
# (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
|
# --with-python=2 or --with-python=3 then we look for PKG module "python2" or
|
||||||
# "python3".
|
# "python3".
|
||||||
pymajor="2"
|
AS_IF([test "x$withval" != xno -a "x$withval" != xyes],
|
||||||
modname="python"
|
[pymajor="$withval"; PYTHON=python${pymajor}], [pymajor="2"])
|
||||||
AS_IF([test "x$withval" != xno -a "x$withval" != xyes], [
|
AM_PATH_PYTHON([$pymajor], [have_python=yes], [have_python=no])
|
||||||
pymajor="$withval"
|
|
||||||
modname="python${pymajor}"
|
|
||||||
])
|
|
||||||
PKG_CHECK_MODULES(PYTHON,[${modname} >= $pymajor],
|
|
||||||
[have_python=yes
|
|
||||||
AM_PATH_PYTHON([$pymajor])],
|
|
||||||
[have_python=no])
|
|
||||||
AS_CASE([$with_python:$have_python],
|
AS_CASE([$with_python:$have_python],
|
||||||
[yes:no],
|
[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_BUILD_INIT([pylibmount], [check])
|
||||||
UL_REQUIRES_HAVE([pylibmount], [python], [libpython])
|
UL_REQUIRES_HAVE([pylibmount], [python], [libpython])
|
||||||
|
@ -1576,7 +1570,8 @@ AC_MSG_RESULT([
|
||||||
ldflags: ${LDFLAGS}
|
ldflags: ${LDFLAGS}
|
||||||
suid ldflags: ${SUID_LDFLAGS}
|
suid ldflags: ${SUID_LDFLAGS}
|
||||||
|
|
||||||
Python: ${PYTHON_VERSION}
|
Python: ${PYTHON}
|
||||||
|
Python version: ${PYTHON_VERSION}
|
||||||
Python libs: ${pyexecdir}
|
Python libs: ${pyexecdir}
|
||||||
|
|
||||||
Bash completions: ${with_bashcompletiondir}
|
Bash completions: ${with_bashcompletiondir}
|
||||||
|
|
Loading…
Reference in New Issue