2021-04-05 16:32:44 +02:00
|
|
|
--- src/configure.ac 2021-04-05 15:12:39.000000000 +0200
|
|
|
|
|
+++ src/configure.ac 2021-04-05 15:12:49.000000000 +0200
|
2023-03-12 05:36:10 -07:00
|
|
|
@@ -1328,7 +1328,7 @@
|
2015-05-29 20:48:45 +00:00
|
|
|
@echo "python_SYSLIBS='$(SYSLIBS)'"
|
|
|
|
|
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
|
|
|
|
|
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
|
|
|
|
|
- @echo "python_INSTSONAME='$(INSTSONAME)'"
|
|
|
|
|
+ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
|
|
|
|
|
@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
|
|
|
|
|
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
|
|
|
|
|
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
|
2023-03-12 05:36:10 -07:00
|
|
|
@@ -1336,13 +1336,6 @@
|
2018-06-12 18:30:05 +02:00
|
|
|
dnl -- delete the lines from make about Entering/Leaving directory
|
|
|
|
|
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
|
|
|
|
|
rm -f -- "${tmp_mkf}"
|
|
|
|
|
- if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
|
|
|
|
|
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
|
|
|
|
|
- vi_cv_path_python_plibs="-framework Python"
|
|
|
|
|
- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
|
|
|
|
|
- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
|
|
|
|
|
- fi
|
|
|
|
|
- else
|
|
|
|
|
vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
|
|
|
|
|
dnl -- Check if the path contained in python_LINKFORSHARED is
|
|
|
|
|
dnl usable for vim build. If not, make and try other
|
2023-03-12 05:36:10 -07:00
|
|
|
@@ -1366,7 +1359,6 @@
|
2018-06-12 18:30:05 +02:00
|
|
|
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
|
|
|
|
|
dnl remove -ltermcap, it can conflict with an earlier -lncurses
|
|
|
|
|
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
|
|
|
|
|
- fi
|
|
|
|
|
])
|
|
|
|
|
AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
|
|
|
|
|
[
|
