From cf47f59c2ff3f2e4990f2377e40cabb2cdeae446 Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Sun, 4 Feb 2024 10:55:55 +0100
Subject: [PATCH] Remove distutils where possible: Not provided on Python 3.12
 without setuptools

---
 .github/workflows/build_wheel.yml |  2 +-
 m4/python.m4                      | 12 ++++++------
 setup.py                          |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 15c13bf..949a71a 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -27,7 +27,7 @@ jobs:
         sudo add-apt-repository universe &&
         sudo add-apt-repository -y ppa:deadsnakes/ppa &&
         sudo apt-get update &&
-        sudo apt-get install -y autoconf automake autopoint build-essential git libtool pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-distutils python3-pip python3-setuptools
+        sudo apt-get install -y autoconf automake autopoint build-essential git libtool pkg-config python${{ matrix.python-version }} python${{ matrix.python-version }}-dev python${{ matrix.python-version }}-venv python3-pip python3-setuptools
     - name: Install tox
       run: |
         python3 -m pip install tox
diff --git a/m4/python.m4 b/m4/python.m4
index d1f8067..adf6ef8 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -8,7 +8,7 @@ AC_DEFUN([AX_PROG_PYTHON],
   [AS_IF(
     [test "x${PYTHON_VERSION}" != x],
     [ax_python_progs="python${PYTHON_VERSION}"],
-    [ax_python_progs="python python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5"])
+    [ax_python_progs="python python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"])
   AC_CHECK_PROGS(
     [PYTHON],
     [$ax_python_progs])
@@ -41,7 +41,7 @@ AC_DEFUN([AX_PROG_PYTHON_CONFIG],
     [test "x${PYTHON_CONFIG}" = x],
     [AC_CHECK_PROGS(
       [PYTHON_CONFIG],
-      [python-config python3-config python3.12-config python3.11-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python3.1-config python3.0-config python2-config python2.7-config python2.6-config python2.5-config])
+      [python-config python3-config python3.12-config python3.11-config python3.10-config python3.9-config python3.8-config python3.7-config python3.6-config python3.5-config python3.4-config python3.3-config python3.2-config python2-config python2.7-config])
     ])
   AS_IF(
     [test "x${PYTHON_CONFIG}" = x],
@@ -127,14 +127,14 @@ AC_DEFUN([AX_PYTHON_CHECK],
       [$ax_python_exec_prefix])
 
     dnl Check for Python library directory
-    ax_python_pythondir_suffix=`${PYTHON} -c "import sys; import distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_lib(0, 0, prefix=''))" 2>/dev/null`;
+    ax_python_pythondir_suffix=`${PYTHON} -c "import sys; import sysconfig; sys.stdout.write(sysconfig.get_path('purelib', vars={'base': '.'}))" 2>/dev/null`;
 
     AS_IF(
       [test "x${ac_cv_with_pythondir}" = x || test "x${ac_cv_with_pythondir}" = xno],
       [AS_IF(
         [test "x${ac_cv_with_pyprefix}" = x || test "x${ac_cv_with_pyprefix}" = xno],
         [ax_python_pythondir="${ax_python_prefix}/${ax_python_pythondir_suffix}"],
-        [ax_python_pythondir=`${PYTHON} -c "import sys; import distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_lib()) " 2>/dev/null`])],
+        [ax_python_pythondir=`${PYTHON} -c "import sys; import sysconfig; sys.stdout.write(sysconfig.get_path('purelib')) " 2>/dev/null`])],
       [ax_python_pythondir=$ac_cv_with_pythondir])
 
     AC_SUBST(
@@ -142,8 +142,8 @@ AC_DEFUN([AX_PYTHON_CHECK],
       [$ax_python_pythondir])
 
     dnl Check for Python platform specific library directory
-    ax_python_pyexecdir_suffix=`${PYTHON} -c "import sys; import distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_lib(1, 0, prefix=''))" 2>/dev/null`;
-    ax_python_library_dir=`${PYTHON} -c "import sys; import distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_lib(True)) " 2>/dev/null`;
+    ax_python_pyexecdir_suffix=`${PYTHON} -c "import sys; import sysconfig; sys.stdout.write(sysconfig.get_path('platlib', vars={'platbase': '.'}))" 2>/dev/null`;
+    ax_python_library_dir=`${PYTHON} -c "import sys; import sysconfig; sys.stdout.write(sysconfig.get_path('platlib')) " 2>/dev/null`;
 
     AS_IF(
       [test "x${ac_cv_with_pyprefix}" = x || test "x${ac_cv_with_pyprefix}" = xno],
diff --git a/setup.py b/setup.py
index 3a86854..32eb823 100755
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@
 import tarfile
 import zipfile
 
+# This one relies on the distutils backport of setuptools in python 3.12 https://github.com/pypa/setuptools/issues/2806
 from distutils.ccompiler import new_compiler
 
 from setuptools import Extension
@@ -161,7 +162,7 @@ def run(self):
       os.remove(sdist_package_file)
       sdist_package_file = zip_sdist_package_file
 
-    # Inform distutils what files were created.
+    # Inform setuptools what files were created.
     dist_files = getattr(self.distribution, "dist_files", [])
     dist_files.append(("sdist", "", sdist_package_file))