diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-19 21:18:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-19 21:18:54 +0200 |
| commit | 3804aebf60ce15c1323f528469c3db6e741216e5 (patch) | |
| tree | 346679f8bbf06daa8e27b6c22947ad95ca056ae5 /src/configure.in | |
| parent | 368373e9092da2d609b540afdac998b474441d57 (diff) | |
| download | vim-git-3804aebf60ce15c1323f528469c3db6e741216e5.tar.gz | |
Fix configure for Python3 libs and version number. (James Vega)
Diffstat (limited to 'src/configure.in')
| -rw-r--r-- | src/configure.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/configure.in b/src/configure.in index 6a2b9d2e9..112f8a627 100644 --- a/src/configure.in +++ b/src/configure.in @@ -929,7 +929,7 @@ if test "$enable_python3interp" = "yes"; then dnl -- get its version number AC_CACHE_CHECK(Python version,vi_cv_var_python3_version, [[vi_cv_var_python3_version=` - ${vi_cv_path_python3} -c 'import sys; print(sys.version[1:3])'` + ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'` ]]) dnl -- find where python3 thinks it was installed @@ -963,7 +963,7 @@ if test "$enable_python3interp" = "yes"; then vi_cv_path_python3_conf= for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do for subdir in lib share; do - d="${path}/${subdir}/python3${vi_cv_var_python3_version}/config" + d="${path}/${subdir}/python${vi_cv_var_python3_version}/config" if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" fi @@ -985,7 +985,7 @@ if test "$enable_python3interp" = "yes"; then tmp_mkf="$pwd/config-PyMake$$" cat -- "${PYTHON3_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}" __: - @echo "python3_MODLIBS='$(MODLIBS)'" + @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'" @echo "python3_LIBS='$(LIBS)'" @echo "python3_SYSLIBS='$(SYSLIBS)'" @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'" @@ -993,8 +993,8 @@ eof dnl -- delete the lines from make about Entering/Leaving directory eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" - vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython3${vi_cv_var_python3_version}" - vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_MODLIBS} ${python3_LIBS} ${python3_SYSLIBS} ${python3_LINKFORSHARED}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS} ${python3_LINKFORSHARED}" dnl remove -ltermcap, it can conflict with an earlier -lncurses vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` @@ -1002,9 +1002,9 @@ eof PYTHON3_LIBS="${vi_cv_path_python3_plibs}" if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python3${vi_cv_var_python3_version}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}" else - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python3${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python3${vi_cv_var_python3_version}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}" fi PYTHON3_SRC="if_python3.c" dnl For Mac OSX 10.2 config.o is included in the Python library. @@ -1088,7 +1088,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then PYTHON_LIBS= PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o" - PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"libpython3${vi_cv_var_python3_version}.so\\\"" + PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"libpython${vi_cv_var_python3_version}.so\\\"" PYTHON3_LIBS= fi |