source: trunk/dports/editors/vim/files/patch-python.diff

Last change on this file was 152701, checked in by raimue@…, 3 years ago

editors/vim: update to version 8.0.0003

Regenerate patches for new version.
Remove patches applied upstream.
Remove +gtk1 variant, add +gtk3 variant.

File size: 2.3 KB
  • src/configure.in

    old new  
    11061106  fi
    11071107
    11081108  dnl -- find the python executable
    1109   AC_PATH_PROGS(vi_cv_path_python, python2 python)
     1109  AC_MSG_CHECKING(--with-python argument)
     1110  AC_ARG_WITH(python, [  --with-python=PATH       which python to use (default: python)],
     1111        python_name="$withval"; AC_MSG_RESULT($python_name),
     1112        python_name="python"; AC_MSG_RESULT(no))
     1113  AC_SUBST(vi_cv_path_python, $python_name)
    11101114  if test "X$vi_cv_path_python" != "X"; then
    11111115
    11121116    dnl -- get its version number
     
    11851189        @echo "python_SYSLIBS='$(SYSLIBS)'"
    11861190        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
    11871191        @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
    1188         @echo "python_INSTSONAME='$(INSTSONAME)'"
     1192        @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
    11891193        @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
    11901194        @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
    11911195        @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
     
    11931197            dnl -- delete the lines from make about Entering/Leaving directory
    11941198            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    11951199            rm -f -- "${tmp_mkf}"
    1196             if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
    1197                 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
    1198               vi_cv_path_python_plibs="-framework Python"
    1199               if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
    1200                   vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
    1201               fi
    1202             else
    12031200              if test "${vi_cv_var_python_version}" = "1.4"; then
    12041201                  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
    12051202              else
     
    12271224              vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
    12281225              dnl remove -ltermcap, it can conflict with an earlier -lncurses
    12291226              vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
    1230             fi
    12311227        ])
    12321228        AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
    12331229        [
Note: See TracBrowser for help on using the repository browser.