diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-21 13:26:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-21 13:26:49 +0200 |
| commit | f94a13c286ffcf1ba2ce7bf10d686c757c836fe0 (patch) | |
| tree | 227cb9fc40847cbe39a5c9fdcbf4e586d9ba10c2 /src/auto | |
| parent | 01c10524d25e36e72c7e45048a80cdb410165560 (diff) | |
| download | vim-git-f94a13c286ffcf1ba2ce7bf10d686c757c836fe0.tar.gz | |
updated for version 7.3.669v7.3.669
Problem: When building with Cygwin loading Python dynamically fails.
Solution: Use DLLLIBRARY instead of INSTSONAME. (Ken Takata)
Diffstat (limited to 'src/auto')
| -rwxr-xr-x | src/auto/configure | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index bc4607439..d0c935867 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5330,6 +5330,7 @@ __: @echo "python_LIBS='$(LIBS)'" @echo "python_SYSLIBS='$(SYSLIBS)'" @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" + @echo "python_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python_INSTSONAME='$(INSTSONAME)'" eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" @@ -5350,6 +5351,9 @@ eof fi + if test "X$python_DLLLIBRARY" != "X"; then + python_INSTSONAME="$python_DLLLIBRARY" + fi PYTHON_LIBS="${vi_cv_path_python_plibs}" if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\"" @@ -5633,6 +5637,7 @@ __: @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'" @echo "python3_LIBS='$(LIBS)'" @echo "python3_SYSLIBS='$(SYSLIBS)'" + @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python3_INSTSONAME='$(INSTSONAME)'" eof eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" @@ -5645,6 +5650,9 @@ eof fi + if test "X$python3_DLLLIBRARY" != "X"; then + python3_INSTSONAME="$python3_DLLLIBRARY" + fi 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/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\"" |