diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-11 22:19:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-11 22:19:36 +0200 |
| commit | 9ce4213b0322477ace1df5e0aa356b1a5551b445 (patch) | |
| tree | fa2069553a8d0c674f4543edef83d2dcb50e013d /src/auto | |
| parent | 1ed00330bcd169d5fcd72608e2745612b5b1d5b5 (diff) | |
| download | vim-git-9ce4213b0322477ace1df5e0aa356b1a5551b445.tar.gz | |
patch 8.0.1699: leftover stuff for Python 1.4v8.0.1699
Problem: Leftover stuff for Python 1.4.
Solution: Remove outdated Python 1.4 stuff. (Naoki Inada, closes #2794)
Diffstat (limited to 'src/auto')
| -rwxr-xr-x | src/auto/configure | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/auto/configure b/src/auto/configure index 56d5a9dd4..7fe597575 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -679,14 +679,11 @@ PYTHON3_OBJ PYTHON3_SRC PYTHON3_CFLAGS PYTHON3_LIBS -PYTHON3_CONFDIR vi_cv_path_python3 PYTHON_OBJ PYTHON_SRC PYTHON_CFLAGS -PYTHON_GETPATH_CFLAGS PYTHON_LIBS -PYTHON_CONFDIR vi_cv_path_python PERL_LIBS PERL_CFLAGS @@ -6018,11 +6015,7 @@ eof 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 + vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" 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/'` @@ -6068,10 +6061,6 @@ $as_echo "$vi_cv_dll_name_python" >&6; } fi PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" - if test "${vi_cv_var_python_version}" = "1.4"; then - PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o" - fi - PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 $as_echo_n "checking if -pthread should be used... " >&6; } @@ -6175,8 +6164,6 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp argument" >&5 $as_echo_n "checking --enable-python3interp argument... " >&6; } # Check whether --enable-python3interp was given. @@ -6504,7 +6491,6 @@ fi - if test "$python_ok" = yes && test "$python3_ok" = yes; then $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h @@ -14323,7 +14309,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to force -D_FILE_OFFSET_BITS=64" >&5 $as_echo_n "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; } -if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_GETPATH_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then +if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h |