diff options
| -rwxr-xr-x | src/auto/configure | 30 | ||||
| -rw-r--r-- | src/configure.ac | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 44 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index 60b4e8d565..b3985d59db 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -6775,6 +6775,30 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_epfx" >&5 $as_echo "$vi_cv_path_python3_epfx" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's include path" >&5 +$as_echo_n "checking Python's include path... " >&6; } +if ${vi_cv_path_python3_include+:} false; then : + $as_echo_n "(cached) " >&6 +else + vi_cv_path_python3_include=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"include\"))"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_include" >&5 +$as_echo "$vi_cv_path_python3_include" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's include path" >&5 +$as_echo_n "checking Python's include path... " >&6; } +if ${vi_cv_path_python3_platinclude+:} false; then : + $as_echo_n "(cached) " >&6 +else + vi_cv_path_python3_platinclude=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"platinclude\"))"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_platinclude" >&5 +$as_echo "$vi_cv_path_python3_platinclude" >&6; } + if ${vi_cv_path_python3path+:} false; then : $as_echo_n "(cached) " >&6 @@ -6873,10 +6897,10 @@ fi $as_echo "$vi_cv_dll_name_python3" >&6; } PYTHON3_LIBS="${vi_cv_path_python3_plibs}" - if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + if test "${vi_cv_path_python3_include}" = "${vi_cv_path_python3_platinclude}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include}" else - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include} -I${vi_cv_path_python3_platinclude}" fi if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'" diff --git a/src/configure.ac b/src/configure.ac index d753ffe6e5..6a847222cc 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1543,6 +1543,18 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; ${vi_cv_path_python3} -c \ "import sys; print(sys.exec_prefix)"` ]) + dnl -- python3's include path + AC_CACHE_CHECK(Python's include path,vi_cv_path_python3_include, + [ vi_cv_path_python3_include=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"include\"))"` ]) + + dnl -- python3's platform include path + AC_CACHE_CHECK(Python's include path,vi_cv_path_python3_platinclude, + [ vi_cv_path_python3_platinclude=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"platinclude\"))"` ]) + dnl -- python3's internal library path AC_CACHE_VAL(vi_cv_path_python3path, @@ -1621,10 +1633,10 @@ eof ]) PYTHON3_LIBS="${vi_cv_path_python3_plibs}" - if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + if test "${vi_cv_path_python3_include}" = "${vi_cv_path_python3_platinclude}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include}" else - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include} -I${vi_cv_path_python3_platinclude}" fi if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then dnl Define PYTHON3_HOME if --with-python-config-dir was used diff --git a/src/version.c b/src/version.c index 55809c528d..cc05920d01 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1794, +/**/ 1793, /**/ 1792, |