Commit 3951cb05 authored by Ondřej Surý's avatar Ondřej Surý
Browse files

When --with-python is given to configure, use default search list for python...

When --with-python is given to configure, use default search list for python binaries instead of 'yes'
parent 41478d0a
...@@ -12180,12 +12180,14 @@ except: exit(1)' ...@@ -12180,12 +12180,14 @@ except: exit(1)'
testply='try: import ply testply='try: import ply
except: exit(1)' 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. # Check whether --with-python was given.
if test "${with_python+set}" = set; then : if test "${with_python+set}" = set; then :
withval=$with_python; withval=$with_python;
else 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 fi
   
   
...@@ -12197,6 +12199,10 @@ else ...@@ -12197,6 +12199,10 @@ else
fi fi
   
   
if test "$with_python" = "yes"; then :
with_python=$default_with_python
fi
if test "$with_python" = "no"; then : if test "$with_python" = "no"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python support" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python support" >&5
$as_echo_n "checking for Python support... " >&6; } $as_echo_n "checking for Python support... " >&6; }
......
...@@ -191,15 +191,20 @@ except: exit(1)' ...@@ -191,15 +191,20 @@ except: exit(1)'
testply='try: import ply testply='try: import ply
except: exit(1)' 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], AC_ARG_WITH([python],
AS_HELP_STRING([--with-python=PATH], AS_HELP_STRING([--with-python=PATH],
[specify path to Python interpreter]), [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], AC_ARG_WITH([python-install-dir],
AS_HELP_STRING([--with-python-install-dir=PATH], AS_HELP_STRING([--with-python-install-dir=PATH],
[installation directory for Python modules]), [installation directory for Python modules]),
[], with_python_install_dir="") [], with_python_install_dir="")
AS_IF([test "$with_python" = "yes"],
[with_python=$default_with_python])
AS_IF([test "$with_python" = "no"], AS_IF([test "$with_python" = "no"],
[AC_MSG_CHECKING([for Python support]) [AC_MSG_CHECKING([for Python support])
AC_MSG_RESULT([disabled])], AC_MSG_RESULT([disabled])],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment