patch 9.0.1441: MacOS: Python 3 using framework do not set dll name properly

Problem:    MacOS: Python 3 using framework do not set dll name properly.
Solution:   Use the framework prefix. (Yee Cheng Chin, closes #12189)

diff --git a/src/auto/configure b/src/auto/configure
index ba5a0744cbb2c4ddfb8dfa878861c5a8de3203e7..57e498fc6a6156a4dcd7fdaa74bce78457a1d6ce 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6865,6 +6865,7 @@ __:
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
        @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
        @echo "python3_INSTSONAME='$(INSTSONAME)'"
+       @echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
 eof
                    eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
            rm -f -- "${tmp_mkf}"
@@ -6883,6 +6884,8 @@ else
 
          if test "X$python3_DLLLIBRARY" != "X"; then
            vi_cv_dll_name_python3="$python3_DLLLIBRARY"
+         elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then
+           vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}"
          else
            vi_cv_dll_name_python3="$python3_INSTSONAME"
          fi

diff --git a/src/configure.ac b/src/configure.ac
index 94e186382dd3acca8f32c5c3685f464c265c82e9..ec4141dc87a95d8da0c695e3240609989da5e8fc 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1584,6 +1584,7 @@ __:
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
        @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
        @echo "python3_INSTSONAME='$(INSTSONAME)'"
+       @echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
 eof
            dnl -- delete the lines from make about Entering/Leaving directory
            eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@@ -1598,6 +1599,8 @@ eof
        [
          if test "X$python3_DLLLIBRARY" != "X"; then
            vi_cv_dll_name_python3="$python3_DLLLIBRARY"
+         elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then
+           vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}"
          else
            vi_cv_dll_name_python3="$python3_INSTSONAME"
          fi

diff --git a/src/version.c b/src/version.c
index 853ea5f181dfb98eed21e19fdfc65853956c8643..856eb4666197bb08b36f025b4803c4e8ff2afd9a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1441,
 /**/
     1440,
 /**/