To: vim_dev@googlegroups.com Subject: Patch 7.4a.011 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4a.011 Problem: Configure check for Python 3 config name isn't right. Solution: Always include vi_cv_var_python3_version. (Tim Harder) Files: src/configure.in, src/auto/configure *** ../vim-7.4a.010/src/configure.in 2013-07-09 21:57:48.000000000 +0200 --- src/configure.in 2013-07-10 22:06:16.000000000 +0200 *************** *** 1110,1119 **** AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, [ vi_cv_path_python3_conf= ! config_dir="config" ! if test "${vi_cv_var_python3_abiflags}" != ""; then ! config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" ! fi d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" --- 1110,1116 ---- AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, [ vi_cv_path_python3_conf= ! config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" *** ../vim-7.4a.010/src/auto/configure 2013-07-09 21:57:48.000000000 +0200 --- src/auto/configure 2013-07-10 22:08:39.000000000 +0200 *************** *** 5674,5683 **** else vi_cv_path_python3_conf= ! config_dir="config" ! if test "${vi_cv_var_python3_abiflags}" != ""; then ! config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" ! fi d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" --- 5674,5680 ---- else vi_cv_path_python3_conf= ! config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" *** ../vim-7.4a.010/src/version.c 2013-07-09 21:57:48.000000000 +0200 --- src/version.c 2013-07-10 22:08:32.000000000 +0200 *************** *** 729,730 **** --- 729,732 ---- { /* Add new patch number below this line */ + /**/ + 11, /**/ -- It might look like I'm doing nothing, but at the cellular level I'm really quite busy. /// 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 ///