Ticket #15099: patch-vim-python.diff

File patch-vim-python.diff, 2.4 KB (added by raimue (Rainer Müller), 16 years ago)

files/patch-vim-python.diff

  • src/configure.in

    old new  
    613613AC_MSG_RESULT($enable_pythoninterp)
    614614if test "$enable_pythoninterp" = "yes"; then
    615615  dnl -- find the python executable
    616   AC_PATH_PROG(vi_cv_path_python, python)
     616  AC_MSG_CHECKING(--with-python argument)
     617  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     618        python_name="$withval"; AC_MSG_RESULT($python_name),
     619        python_name="python"; AC_MSG_RESULT(no))
     620  AC_SUBST(vi_cv_path_python, $python_name)
    617621  if test "X$vi_cv_path_python" != "X"; then
    618622
    619623    dnl -- get its version number
     
    690690            dnl -- delete the lines from make about Entering/Leaving directory
    691691            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    692692            rm -f -- "${tmp_mkf}"
    693             if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
    694                 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
    695               vi_cv_path_python_plibs="-framework Python"
    696             else
    697               if test "${vi_cv_var_python_version}" = "1.4"; then
    698                   vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    699               else
    700                   vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    701               fi
    702               vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    703               dnl remove -ltermcap, it can conflict with an earlier -lncurses
    704               vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    705             fi
     693            if test "${vi_cv_var_python_version}" = "1.4"; then
     694                vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
     695            else
     696                vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
     697            fi
     698            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
     699            dnl remove -ltermcap, it can conflict with an earlier -lncurses
     700            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    706701        ])
    707702
    708703        PYTHON_LIBS="${vi_cv_path_python_plibs}"