source: trunk/dports/editors/MacVim/files/patch-python.diff @ 101347

Last change on this file since 101347 was 101347, checked in by raimue@…, 7 years ago

editors/MacVim:
Update to version 7.3.snapshot66, closes #37305
Make +huge the default variant, see #36212

File size: 2.7 KB
  • src/configure.in

    old new  
    762762AC_MSG_RESULT($enable_pythoninterp)
    763763if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    764764  dnl -- find the python executable
    765   AC_PATH_PROG(vi_cv_path_python, python)
     765  AC_MSG_CHECKING(--with-python argument)
     766  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     767        python_name="$withval"; AC_MSG_RESULT($python_name),
     768        python_name="python"; AC_MSG_RESULT(no))
     769  AC_SUBST(vi_cv_path_python, $python_name)
    766770  if test "X$vi_cv_path_python" != "X"; then
    767771
    768772    dnl -- get its version number
     
    840844            dnl -- delete the lines from make about Entering/Leaving directory
    841845            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    842846            rm -f -- "${tmp_mkf}"
    843             if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
    844                 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
    845               vi_cv_path_python_plibs="-framework Python"
     847            if test "${vi_cv_var_python_version}" = "1.4"; then
     848              vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    846849            else
    847               if test "${vi_cv_var_python_version}" = "1.4"; then
    848                   vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    849               else
    850                   vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    851               fi
    852               vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    853               dnl remove -ltermcap, it can conflict with an earlier -lncurses
    854               vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
     850              vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
    855851            fi
     852            vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
     853            dnl remove -ltermcap, it can conflict with an earlier -lncurses
     854            vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    856855        ])
    857856
    858857        if test "X$python_DLLLIBRARY" != "X"; then
  • src/if_python.c

    old new  
    4646
    4747#define PY_SSIZE_T_CLEAN
    4848
    49 #ifdef FEAT_GUI_MACVIM
    50 # include <Python/Python.h>
    51 #else
    52 # include <Python.h>
    53 #endif
    54 
     49#include <Python.h>
    5550#if defined(MACOS) && !defined(MACOS_X_UNIX)
    5651# include "macglue.h"
    5752# include <CodeFragments.h>
Note: See TracBrowser for help on using the repository browser.