Ticket #47833: patch-python.diff

src/configure.in

@@ -1069 +1069 @@
   fi
 
   dnl -- find the python executable
-  AC_PATH_PROGS(vi_cv_path_python, python2 python)
+  AC_MSG_CHECKING(--with-python argument)
+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
+        python_name="$withval"; AC_MSG_RESULT($python_name),
+        python_name="python"; AC_MSG_RESULT(no))
+  AC_SUBST(vi_cv_path_python, $python_name)
   if test "X$vi_cv_path_python" != "X"; then
 
     dnl -- get its version number
@@ -1156 +1160 @@
             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$MACOSX" = "xyes" && ${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
-              if test "${vi_cv_var_python_version}" = "1.4"; then
-                  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
-              else
-                  vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
-              fi
-              dnl -- Check if the path contained in python_LINKFORSHARED is
-              dnl    usable for vim build. If not, make and try other
-              dnl    candidates.
-              if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
-                python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]].*/\1/'`
-                python_link_path=`echo ${python_LINKFORSHARED} |   sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]][[ \t]]*\(.*\)/\2/'`
-                if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
-                  dnl -- The path looks relative. Guess the absolute one using
-                  dnl    the prefix and try that.
-                  python_link_path="${python_PYTHONFRAMEWORKPREFIX}/${python_link_path}"
-                  if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
-                    dnl -- A last resort.
-                    python_link_path="${python_PYTHONFRAMEWORKINSTALLDIR}/Versions/${vi_cv_var_python_version}/${python_PYTHONFRAMEWORK}"
-                    dnl -- No check is done. The last word is left to the
-                    dnl    "sanity" test on link flags that follows shortly.
-                  fi
-                  python_LINKFORSHARED="${python_link_symbol} ${python_link_path}"
-                fi
-              fi
-              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
+            vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
+            dnl remove -ltermcap, it can conflict with an earlier -lncurses
+            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
         ])
         AC_CACHE_VAL(vi_cv_dll_name_python,
         [
@@ -1202 +1174 @@
         ])
 
         PYTHON_LIBS="${vi_cv_path_python_plibs}"
-        if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-        else
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
-        fi
+        PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
         PYTHON_SRC="if_python.c"
         PYTHON_OBJ="objects/if_python.o"
         if test "${vi_cv_var_python_version}" = "1.4"; then