When --with-python is given to configure, use default search list for python binaries instead of 'yes'

(cherry picked from commit 3951cb053b)
This commit is contained in:
Ondřej Surý 2018-12-18 15:05:52 +01:00 committed by Michał Kępień
parent 235e6e481c
commit 1d92178bec
2 changed files with 13 additions and 2 deletions

8
configure vendored
View file

@ -12512,12 +12512,14 @@ except: exit(1)'
testply='try: import ply
except: exit(1)'
default_with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
# Check whether --with-python was given.
if test "${with_python+set}" = set; then :
withval=$with_python;
else
with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
with_python=$default_with_python
fi
@ -12529,6 +12531,10 @@ else
fi
if test "$with_python" = "yes"; then :
with_python=$default_with_python
fi
if test "$with_python" = "no"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python support" >&5
$as_echo_n "checking for Python support... " >&6; }

View file

@ -249,15 +249,20 @@ except: exit(1)'
testply='try: import ply
except: exit(1)'
default_with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
AC_ARG_WITH([python],
AS_HELP_STRING([--with-python=PATH],
[specify path to Python interpreter]),
[], [with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"])
[], [with_python=$default_with_python])
AC_ARG_WITH([python-install-dir],
AS_HELP_STRING([--with-python-install-dir=PATH],
[installation directory for Python modules]),
[], with_python_install_dir="")
AS_IF([test "$with_python" = "yes"],
[with_python=$default_with_python])
AS_IF([test "$with_python" = "no"],
[AC_MSG_CHECKING([for Python support])
AC_MSG_RESULT([disabled])],