To: vim_dev@googlegroups.com Subject: Patch 8.0.1719 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1719 Problem: Cannot specify which Python executable configure should use. Solution: Add --with-python-command and --with-python3-command. Files: src/configure.ac, src/auto/configure *** ../vim-8.0.1718/src/configure.ac 2018-04-15 13:12:41.924401055 +0200 --- src/configure.ac 2018-04-15 15:57:14.950627484 +0200 *************** *** 1117,1123 **** fi dnl -- find the python executable ! AC_PATH_PROGS(vi_cv_path_python, python2 python) if test "X$vi_cv_path_python" != "X"; then dnl -- get its version number --- 1117,1131 ---- fi dnl -- find the python executable ! AC_MSG_CHECKING(--with-python-command argument) ! AC_SUBST(vi_cv_path_python) ! AC_ARG_WITH(python-command, [ --with-python-command=NAME name of the Python 2 command (default: python2 or python)], ! vi_cv_path_python="$withval"; AC_MSG_RESULT($vi_cv_path_python), ! AC_MSG_RESULT(no)) ! ! if test "X$vi_cv_path_python" = "X"; then ! AC_PATH_PROGS(vi_cv_path_python, python2 python) ! fi if test "X$vi_cv_path_python" != "X"; then dnl -- get its version number *************** *** 1156,1162 **** dnl -- where the Python implementation library archives are AC_ARG_WITH(python-config-dir, ! [ --with-python-config-dir=PATH Python's config directory], [ vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, --- 1164,1170 ---- dnl -- where the Python implementation library archives are AC_ARG_WITH(python-config-dir, ! [ --with-python-config-dir=PATH Python's config directory (deprecated)], [ vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, *************** *** 1343,1349 **** fi dnl -- find the python3 executable ! AC_PATH_PROGS(vi_cv_path_python3, python3 python) if test "X$vi_cv_path_python3" != "X"; then dnl -- get its version number --- 1351,1365 ---- fi dnl -- find the python3 executable ! AC_MSG_CHECKING(--with-python3-command argument) ! AC_SUBST(vi_cv_path_python3) ! AC_ARG_WITH(python3-command, [ --with-python3-command=NAME name of the Python 3 command (default: python3 or python)], ! vi_cv_path_python3="$withval"; AC_MSG_RESULT($vi_cv_path_python3), ! AC_MSG_RESULT(no)) ! ! if test "X$vi_cv_path_python3" = "X"; then ! AC_PATH_PROGS(vi_cv_path_python3, python3 python) ! fi if test "X$vi_cv_path_python3" != "X"; then dnl -- get its version number *************** *** 1393,1399 **** dnl -- where the Python implementation library archives are AC_ARG_WITH(python3-config-dir, ! [ --with-python3-config-dir=PATH Python's config directory], [ vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, --- 1409,1415 ---- dnl -- where the Python implementation library archives are AC_ARG_WITH(python3-config-dir, ! [ --with-python3-config-dir=PATH Python's config directory (deprecated)], [ vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, *** ../vim-8.0.1718/src/auto/configure 2018-04-15 13:12:41.928401027 +0200 --- src/auto/configure 2018-04-15 15:57:17.666607281 +0200 *************** *** 802,809 **** --- 802,811 ---- with_plthome enable_perlinterp enable_pythoninterp + with_python_command with_python_config_dir enable_python3interp + with_python3_command with_python3_config_dir enable_tclinterp with_tclsh *************** *** 1532,1539 **** --with-lua-prefix=PFX Prefix where Lua is installed. --with-luajit Link with LuaJIT instead of Lua. --with-plthome=PLTHOME Use PLTHOME. ! --with-python-config-dir=PATH Python's config directory ! --with-python3-config-dir=PATH Python's config directory --with-tclsh=PATH which tclsh to use (default: tclsh8.0) --with-ruby-command=RUBY name of the Ruby command (default: ruby) --with-x use the X Window System --- 1534,1543 ---- --with-lua-prefix=PFX Prefix where Lua is installed. --with-luajit Link with LuaJIT instead of Lua. --with-plthome=PLTHOME Use PLTHOME. ! --with-python-command=NAME name of the Python 2 command (default: python2 or python) ! --with-python-config-dir=PATH Python's config directory (deprecated) ! --with-python3-command=NAME name of the Python 3 command (default: python3 or python) ! --with-python3-config-dir=PATH Python's config directory (deprecated) --with-tclsh=PATH which tclsh to use (default: tclsh8.0) --with-ruby-command=RUBY name of the Ruby command (default: ruby) --with-x use the X Window System *************** *** 5937,5942 **** --- 5941,5961 ---- as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 + $as_echo_n "checking --with-python-command argument... " >&6; } + + + # Check whether --with-python-command was given. + if test "${with_python_command+set}" = set; then : + withval=$with_python_command; vi_cv_path_python="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 + $as_echo "$vi_cv_path_python" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test "X$vi_cv_path_python" = "X"; then for ac_prog in python2 python do # Extract the first word of "$ac_prog", so it can be a program name with args. *************** *** 5982,5987 **** --- 6001,6007 ---- test -n "$vi_cv_path_python" && break done + fi if test "X$vi_cv_path_python" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 *************** *** 6271,6276 **** --- 6291,6311 ---- as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 + $as_echo_n "checking --with-python3-command argument... " >&6; } + + + # Check whether --with-python3-command was given. + if test "${with_python3_command+set}" = set; then : + withval=$with_python3_command; vi_cv_path_python3="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 + $as_echo "$vi_cv_path_python3" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test "X$vi_cv_path_python3" = "X"; then for ac_prog in python3 python do # Extract the first word of "$ac_prog", so it can be a program name with args. *************** *** 6316,6321 **** --- 6351,6357 ---- test -n "$vi_cv_path_python3" && break done + fi if test "X$vi_cv_path_python3" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 *** ../vim-8.0.1718/src/version.c 2018-04-15 13:28:37.853603647 +0200 --- src/version.c 2018-04-15 16:01:28.852749325 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1719, /**/ -- A computer program does what you tell it to do, not what you want it to do. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///