Specify library to load for Python more precisely. (James Vega)

diff --git a/src/auto/configure b/src/auto/configure
index 4ab3ae649fe60b78489953dd4b4b1bb467144f34..209ad6c6608404df88bfdcd716af462ea74acdad 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5255,6 +5255,7 @@ __:
        @echo "python_LIBS='$(LIBS)'"
        @echo "python_SYSLIBS='$(SYSLIBS)'"
        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+       @echo "python_INSTSONAME='$(INSTSONAME)'"
 eof
                    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
            rm -f -- "${tmp_mkf}"
@@ -5537,6 +5538,7 @@ __:
        @echo "python3_LIBS='$(LIBS)'"
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
        @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
+       @echo "python3_INSTSONAME='$(INSTSONAME)'"
 eof
                     eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
           rm -f -- "${tmp_mkf}"
@@ -5659,11 +5661,11 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
 
   PYTHON_SRC="if_python.c"
   PYTHON_OBJ="objects/if_python.o"
-  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"libpython${vi_cv_var_python_version}.so\\\""
+  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
   PYTHON_LIBS=
   PYTHON3_SRC="if_python3.c"
   PYTHON3_OBJ="objects/if_python3.o"
-  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"libpython${vi_cv_var_python3_version}.so\\\""
+  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
   PYTHON3_LIBS=
 fi
 

diff --git a/src/configure.in b/src/configure.in
index 0492eb08dd48b915aded463591882e7a2dabb11d..18c7ff1825df7a0d640b57ba491ae58315a99343 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -822,6 +822,7 @@ __:
        @echo "python_LIBS='$(LIBS)'"
        @echo "python_SYSLIBS='$(SYSLIBS)'"
        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+       @echo "python_INSTSONAME='$(INSTSONAME)'"
 eof
            dnl -- delete the lines from make about Entering/Leaving directory
            eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@@ -1001,6 +1002,7 @@ __:
        @echo "python3_LIBS='$(LIBS)'"
        @echo "python3_SYSLIBS='$(SYSLIBS)'"
        @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
+       @echo "python3_INSTSONAME='$(INSTSONAME)'"
 eof
           dnl -- delete the lines from make about Entering/Leaving directory
           eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@@ -1096,11 +1098,11 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then
   AC_DEFINE(DYNAMIC_PYTHON3)
   PYTHON_SRC="if_python.c"
   PYTHON_OBJ="objects/if_python.o"
-  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"libpython${vi_cv_var_python_version}.so\\\""
+  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
   PYTHON_LIBS=
   PYTHON3_SRC="if_python3.c"
   PYTHON3_OBJ="objects/if_python3.o"
-  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"libpython${vi_cv_var_python3_version}.so\\\""
+  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
   PYTHON3_LIBS=
 fi