Merge branch 'dev-github-pr7' into 'next'

Use EXT_SUFFIX when available for determining Python library suffix

See merge request !1160

configure.ac

@@ -410,11 +410,11 @@ if test "$enables_python" = "yes"; then
     AC_SUBST(PYTHON_LIBS)
 
     if test "${build}" = "${host}"; then
-        PYTHON_SOABI=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed s/None//`
+        PYTHON_EXT_SUFFIX=`$PYTHON -c "from distutils import sysconfig; v = sysconfig.get_config_vars(); print(v.get('EXT_SUFFIX', v.get('SO')))" | sed s/None//`
     else
-        PYTHON_SOABI=""
+        PYTHON_EXT_SUFFIX=""
     fi
-    AC_SUBST(PYTHON_SOABI)
+    AC_SUBST(PYTHON_EXT_SUFFIX)
 
     AC_ARG_WITH(python-site-arch, AC_HELP_STRING([--with-python-site-arch=directory], [Direcory where Python modules will be installed - defaults is to query the Python binary]))
     if test "X$PYTHON_SITE_ARCH" = "X"; then
@@ -548,8 +548,8 @@ if test "$enables_altpython" = "yes"; then
     AC_SUBST(ALTPYTHON_CFLAGS)
     AC_SUBST(ALTPYTHON_LIBS)
 
-    ALTPYTHON_SOABI=`$ALTPYTHON -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed s/None//`
-    AC_SUBST(ALTPYTHON_SOABI)
+    ALTPYTHON_EXT_SUFFIX=`$ALTPYTHON -c "from distutils import sysconfig; v = sysconfig.get_config_vars(); print(v.get('EXT_SUFFIX', v.get('SO')))" | sed s/None//`
+    AC_SUBST(ALTPYTHON_EXT_SUFFIX)
 
     AC_ARG_WITH(altpython-site-arch, AC_HELP_STRING([--with-altpython-site-arch=directory], [Direcory where Python modules will be installed - defaults is to query the Python binary]))
     if test "X$ALTPYTHON_SITE_ARCH" = "X"; then

python/altpython/arc/Makefile.am

@@ -8,7 +8,7 @@ PYTHON_PLATFORM = @ALTPYTHON_PLATFORM@
 PYTHON_PREFIX = @ALTPYTHON_PREFIX@
 PYTHON_SITE_ARCH = @ALTPYTHON_SITE_ARCH@
 PYTHON_SITE_LIB = @ALTPYTHON_SITE_LIB@
-PYTHON_SOABI = @ALTPYTHON_SOABI@
+PYTHON_EXT_SUFFIX = @ALTPYTHON_EXT_SUFFIX@
 PYTHON_VERSION = @ALTPYTHON_VERSION@
 
 if ALTPYTHON3

python/common.mk

@@ -128,9 +128,9 @@ $(ARCWRAPPERS): %_wrap.cpp: $(top_srcdir)/swig/%.i $(top_srcdir)/swig/Arc.i $(PY
         done
 
 install-data-hook:
-	if test -n "$(PYTHON_SOABI)" ; then \
+	if [ "$(PYTHON_EXT_SUFFIX)" != ".so" ]; then \
 	  mv $(DESTDIR)$(pyexecdir)/_arc.so \
-	  $(DESTDIR)$(pyexecdir)/_arc.$(PYTHON_SOABI).so ; \
+	  $(DESTDIR)$(pyexecdir)/_arc$(PYTHON_EXT_SUFFIX) ; \
 	fi
 
 .NOTPARALLEL: %.lo %.o