updated for version 7.3.669

Problem:    When building with Cygwin loading Python dynamically fails.
Solution:   Use DLLLIBRARY instead of INSTSONAME. (Ken Takata)

diff --git a/src/auto/configure b/src/auto/configure
index bc460743920bc69dabc34b6d4e9554b79b7155cc..d0c935867bd920d0a4ae6c5ca68d46c92b9c3f69 100755 (executable)
--- 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}\\\""

diff --git a/src/configure.in b/src/configure.in
index 2ff0f90a1a0512f3f9280875a57fdbbea724661a..5c14fc0c5c7bcaf27c4aee7dfc33b732421cb354 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -889,6 +889,7 @@ __:
        @echo "python_LIBS='$(LIBS)'"
        @echo "python_SYSLIBS='$(SYSLIBS)'"
        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+       @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
        @echo "python_INSTSONAME='$(INSTSONAME)'"
 eof
            dnl -- delete the lines from make about Entering/Leaving directory
@@ -909,6 +910,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}\\\""
@@ -1082,6 +1086,7 @@ __:
        @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
        @echo "python3_LIBS='$(LIBS)'"
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
+       @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
        @echo "python3_INSTSONAME='$(INSTSONAME)'"
 eof
           dnl -- delete the lines from make about Entering/Leaving directory
@@ -1094,6 +1099,9 @@ eof
           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
       ])
 
+      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}\\\""

diff --git a/src/version.c b/src/version.c
index 61e9c0bb1aea3b076bc7397a92b11162cf891ff4..6ac25907c23a7f8b9cdcfed266da872c45e1b93b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    669,
 /**/
     668,
 /**/