Ticket #26140: patch-python.diff

File patch-python.diff, 2.4 KB (added by jjahson@…, 14 years ago)

Python diff with fixed line numbers

Line 
1--- src/configure.in.old        2008-12-07 02:58:32.000000000 +0100
2+++ src/configure.in    2008-12-07 02:58:58.000000000 +0100
3@@ -762,7 +762,11 @@
4AC_MSG_RESULT($enable_pythoninterp)
5if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
6   dnl -- find the python executable
7-  AC_PATH_PROG(vi_cv_path_python, python)
8+  AC_MSG_CHECKING(--with-python argument)
9+  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
10+        python_name="$withval"; AC_MSG_RESULT($python_name),
11+        python_name="python"; AC_MSG_RESULT(no))
12+  AC_SUBST(vi_cv_path_python, $python_name)
13   if test "X$vi_cv_path_python" != "X"; then
14 
15     dnl -- get its version number
16@@ -840,19 +840,14 @@
17            dnl -- delete the lines from make about Entering/Leaving directory
18            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
19            rm -f -- "${tmp_mkf}"
20-           if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
21-               "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
22-             vi_cv_path_python_plibs="-framework Python"
23-           else
24-             if test "${vi_cv_var_python_version}" = "1.4"; then
25-                 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
26-             else
27-                 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
28-             fi
29-             vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
30-             dnl remove -ltermcap, it can conflict with an earlier -lncurses
31-             vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
32-           fi
33+            if test "${vi_cv_var_python_version}" = "1.4"; then
34+                vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
35+            else
36+                vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
37+            fi
38+            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
39+            dnl remove -ltermcap, it can conflict with an earlier -lncurses
40+            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
41        ])
42 
43        PYTHON_LIBS="${vi_cv_path_python_plibs}"