Revert "Remove remaining use of deprecated distutils."

This reverts commit 7cb74c9.

Author: andypugh

src/configure.ac

@@ -1684,7 +1684,7 @@ fi
 AC_MSG_RESULT([$PYTHON_TK_VERSION])
 
 AC_MSG_CHECKING(for site-package location)
-SITEPY=`$PYTHON -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`
+SITEPY=`$PYTHON -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'`
 AC_MSG_RESULT($SITEPY)
 
 AC_MSG_CHECKING(for working GLU quadrics)

src/m4/ax_python.m4

@@ -64,7 +64,7 @@ if test x$ax_python_bin != x; then
      AC_CHECK_LIB(${ax_python_bin}m, main, ax_python_lib=${ax_python_bin}m, ax_python_lib=no)
    fi
    if test x$ax_python_lib != xno; then
-     ax_python_header=`$ax_python_bin -c "import sysconfig; print(sysconfig.sysconfig.get_path("include"))"`
+     ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"`
      if test x$ax_python_header != x; then
        break;
      fi

src/m4/ax_python_devel.m4

@@ -133,18 +133,27 @@ variable to configure. See ``configure --help'' for reference.
 	fi
 
 	#
-	# Check if you have sysconfig, else fail
+	# Check if you have distutils, else fail
 	#
 	AC_MSG_CHECKING([for the sysconfig Python package])
 	ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
 	if test $? -eq 0; then
 		AC_MSG_RESULT([yes])
 		IMPORT_SYSCONFIG="import sysconfig"
 	else
-        AC_MSG_ERROR([cannot import Python module "sysconfig".
+		AC_MSG_RESULT([no])
+
+		AC_MSG_CHECKING([for the distutils Python package])
+		ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
+		if test $? -eq 0; then
+			AC_MSG_RESULT([yes])
+			IMPORT_SYSCONFIG="from distutils import sysconfig"
+		else
+			AC_MSG_ERROR([cannot import Python module "distutils".
 Please check your Python installation. The error was:
 $ac_sysconfig_result])
 			PYTHON_VERSION=""
+		fi
 	fi
 
 	#
@@ -158,6 +167,12 @@ $ac_sysconfig_result])
 				print (sysconfig.get_path ('include'));"`
 			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
 				print (sysconfig.get_path ('platinclude'));"`
+		else
+			# old distutils way
+			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_inc ());"`
+			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_inc (plat_specific=1));"`
 		fi
 		if test -n "${python_path}"; then
 			if test "${plat_python_path}" != "${python_path}"; then
@@ -258,6 +273,10 @@ EOD`
 		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
 			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
 				print (sysconfig.get_path('purelib'));"`
+		else
+			# distutils.sysconfig way
+			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_lib(0,0));"`
 		fi
 	fi
 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
@@ -271,6 +290,10 @@ EOD`
 		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
 			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
 				print (sysconfig.get_path('platlib'));"`
+		else
+			# distutils.sysconfig way
+			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_lib(1,0));"`
 		fi
 	fi
 	AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG])