Mercurial > vim
changeset 4001:d9b4cf53be2e v7.3.755
updated for version 7.3.755
Problem: Autoconf doesn't find Python 3 if it's called "python".
Solution: Search for "python2" and "python3" first, then "python".
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 12 Dec 2012 14:25:05 +0100 |
| parents | 52bfa939fc07 |
| children | 67ddca61dadf |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5214,8 +5214,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 $as_echo "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then - # Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 + for ac_prog in python2 python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_vi_cv_path_python+set}" = set; then : @@ -5254,6 +5256,9 @@ else fi + test -n "$vi_cv_path_python" && break +done + if test "X$vi_cv_path_python" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 @@ -5509,8 +5514,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 $as_echo "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then - # Extract the first word of "python3", so it can be a program name with args. -set dummy python3; ac_word=$2 + for ac_prog in python3 python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_vi_cv_path_python3+set}" = set; then : @@ -5549,6 +5556,9 @@ else fi + test -n "$vi_cv_path_python3" && break +done + if test "X$vi_cv_path_python3" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
--- a/src/configure.in +++ b/src/configure.in @@ -838,7 +838,7 @@ AC_ARG_ENABLE(pythoninterp, AC_MSG_RESULT($enable_pythoninterp) if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then dnl -- find the python executable - AC_PATH_PROG(vi_cv_path_python, python) + AC_PATH_PROGS(vi_cv_path_python, python2 python) if test "X$vi_cv_path_python" != "X"; then dnl -- get its version number @@ -1028,7 +1028,7 @@ AC_ARG_ENABLE(python3interp, AC_MSG_RESULT($enable_python3interp) if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then dnl -- find the python3 executable - AC_PATH_PROG(vi_cv_path_python3, python3) + AC_PATH_PROGS(vi_cv_path_python3, python3 python) if test "X$vi_cv_path_python3" != "X"; then dnl -- get its version number