Ticket #47833: patch-python3.diff

src/

@@ -1310 +1310 @@
   fi
 
   dnl -- find the python3 executable
-  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
+  AC_MSG_CHECKING(--with-python3 argument)
+  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
+        python_name="$withval"; AC_MSG_RESULT($python_name),
+        python_name="python3"; AC_MSG_RESULT(no))
+  AC_SUBST(vi_cv_path_python3, $python_name)
   if test "X$vi_cv_path_python3" != "X"; then
 
     dnl -- get its version number
@@ -1405 +1409 @@
             dnl -- delete the lines from make about Entering/Leaving directory
             eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
             rm -f -- "${tmp_mkf}"
-            vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-            vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
+            vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
             dnl remove -ltermcap, it can conflict with an earlier -lncurses
             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
             vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
@@ -1421 +1424 @@
         ])
 
         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} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-        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} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
-        fi
+        PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
         PYTHON3_SRC="if_python3.c"
         PYTHON3_OBJ="objects/if_python3.o"