From 322f3b0d94f32e01e2db0c76fd38409eddf392ce Mon Sep 17 00:00:00 2001

From: Jorge Pereira <jpereiran@gmail.com>

Date: Thu, 5 Dec 2019 16:02:18 -0300

Subject: [PATCH] Fix rlm_python3 build

Just backporting from the master branch.

Backport from rlm_python (#3184) changes to rlm_python3

Brief:

We should append the 'python_path' to sys.path #3180

we should append 'python_path' paths in 'sys.path', due to PySys_SetPath()

reset the entire python path causing problems to use the existing libraries

Remove unnecessary src/modules/rlm_python3/radiusd_test.py

Don't call if 'instantiate' and 'detach' are not declared.

It's related to the discussion in #3185.

Fix missing destroy for some statements

Fix Py_SetProgramName() use (#3196)

As the documentation says, the use of Py_SetProgramName() with wchar_t*

should be only from Python >= 3.5.x

References:

Python <= 3.4.x https://docs.python.org/3.4/extending/embedding.html#very-high-level-embedding

Python >= 3.5.x https://docs.python.org/3.5/extending/embedding.html#very-high-level-embedding

Add missing 'ifdef WITH_PROXY' checks (#3198)

Clean up (#3197)

don't try and build rlm_python3 if we can't configure it

Just call Py_DECREF() (#3199)

Fix libpython3 cross platform load (#3284)

Python3 fixes (#3350)

* python3-config for Python 3.8 requires --embed parameter

As described in https://bugs.python.org/issue36721, python3-config now

requires --embed for embedded interpreters. Otherwise, -lpython3.8 is

not included in ldflags

* Python 3.8 has removed the "m" suffix in the library name

As discussed in: https://bugs.python.org/issue36707

* Use dl_iterate_phdr to find the appropriate python library

Otherwise, installation of the libpython3-dev packages is required

in most distributions

* Update configure file for rlm_python3

* Use AX_COMPARE_VERSION to check Python version

Keep the module directory in python_path

---

 raddb/mods-available/python             |    2 +-

 raddb/mods-available/python3            |    2 +-

 src/include/conf.h                      |    8 +

 src/main/modules.c                      |    8 -

 src/modules/rlm_python3/configure       | 1008 ++++++++---------------

 src/modules/rlm_python3/configure.ac    |  163 ++--

 src/modules/rlm_python3/radiusd_test.py |   63 --

 src/modules/rlm_python3/rlm_python3.c   |  188 ++---

 8 files changed, 516 insertions(+), 926 deletions(-)

 delete mode 100644 src/modules/rlm_python3/radiusd_test.py

diff --git a/raddb/mods-available/python b/raddb/mods-available/python

index bd172dca05..c19ddcd87e 100644

--- a/raddb/mods-available/python

+++ b/raddb/mods-available/python

@@ -13,7 +13,7 @@ python {

 	#  item is GLOBAL TO THE SERVER.  That is, you cannot have two

 	#  instances of the python module, each with a different path.

 	#

-#        python_path="/path/to/python/files:/another_path/to/python_files/"

+#        python_path="${modconfdir}/${.:name}:/path/to/python/files:/another_path/to/python_files/"

 	module = example

diff --git a/raddb/mods-available/python3 b/raddb/mods-available/python3

index 246dfd74ce..0593c69f1a 100644

--- a/raddb/mods-available/python3

+++ b/raddb/mods-available/python3

@@ -13,7 +13,7 @@ python3 {

 	#  item is GLOBAL TO THE SERVER.  That is, you cannot have two

 	#  instances of the python module, each with a different path.

 	#

-#        python_path="/path/to/python/files:/another_path/to/python_files/"

+#	python_path="${modconfdir}/${.:name}:/another_path/to/python_files"

 	module = example

diff --git a/src/include/conf.h b/src/include/conf.h

index 758a332b6e..95005d545f 100644

--- a/src/include/conf.h

+++ b/src/include/conf.h

@@ -13,3 +13,11 @@

 #define SRADUTMP		LOGDIR "/sradutmp"

 #define RADWTMP			LOGDIR "/radwtmp"

 #define SRADWTMP		LOGDIR "/sradwtmp"

+

+#ifdef __APPLE__

+#  define LT_SHREXT ".dylib"

+#elif defined (WIN32)

+#  define LT_SHREXT ".dll"

+#else

+#  define LT_SHREXT ".so"

+#endif

diff --git a/src/main/modules.c b/src/main/modules.c

index 319879c870..c05aa5bf67 100644

--- a/src/main/modules.c

+++ b/src/main/modules.c

@@ -95,14 +95,6 @@ const section_type_value_t section_type_value[MOD_COUNT] = {

 #define RTLD_LOCAL (0)

 #endif

-#ifdef __APPLE__

-#  define LT_SHREXT ".dylib"

-#elif defined (WIN32)

-#  define LT_SHREXT ".dll"

-#else

-#  define LT_SHREXT ".so"

-#endif

-

 /** Check if the magic number in the module matches the one in the library

  *

  * This is used to detect potential ABI issues caused by running with modules which

diff --git a/src/modules/rlm_python3/configure b/src/modules/rlm_python3/configure

index ff89a16149..05907f12c3 100755

--- a/src/modules/rlm_python3/configure

+++ b/src/modules/rlm_python3/configure

@@ -588,7 +588,17 @@ LIBOBJS

 targetname

 mod_cflags

 mod_ldflags

-PYTHON3_BIN

+AWK

+PYTHON3_CONFIG_BIN

+pkgpyexecdir

+pyexecdir

+pkgpythondir

+pythondir

+PYTHON_PLATFORM

+PYTHON_EXEC_PREFIX

+PYTHON_PREFIX

+PYTHON_VERSION

+PYTHON

 CPP

 OBJEXT

 EXEEXT

@@ -638,9 +648,7 @@ SHELL'

 ac_subst_files=''

 ac_user_opts='

 enable_option_checking

-with_rlm_python3_bin

-with_rlm_python3_lib_dir

-with_rlm_python3_include_dir

+with_rlm_python3_config_bin

 '

       ac_precious_vars='build_alias

 host_alias

@@ -650,7 +658,8 @@ CFLAGS

 LDFLAGS

 LIBS

 CPPFLAGS

-CPP'

+CPP

+PYTHON'

 # Initialize some variables set by options.

@@ -1257,9 +1266,7 @@ if test -n "$ac_init_help"; then

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

-  --with-rlm-python3-bin=PATH   Path to python3 binary

-  --with-rlm-python3-lib-dir=DIR       Directory for Python library files

-  --with-rlm-python3-include-dir=DIR   Directory for Python include files

+  --with-rlm-python3-config-bin=PATH   Path to python-config3 binary

 Some influential environment variables:

   CC          C compiler command

@@ -1270,6 +1277,7 @@ Some influential environment variables:

   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if

               you have headers in a nonstandard directory <include dir>

   CPP         C preprocessor

+  PYTHON      the Python interpreter

 Use these variables to override the choices made by `configure' or to help

 it to find libraries and programs with nonstandard names/locations.

@@ -2822,46 +2830,92 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $

 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-		PYTHON3_BIN=

-# Check whether --with-rlm-python3-bin was given.

-if test "${with_rlm_python3_bin+set}" = set; then :

-  withval=$with_rlm_python3_bin;  case "$withval" in

-	    no)

-		as_fn_error $? "Need rlm-python3-bin" "$LINENO" 5

-		;;

-	    yes)

-		;;

-	    *)

-		PYTHON3_BIN="$withval"

-		;;

-	  esac

-fi

-	if test "x$PYTHON3_BIN" = x; then

-		for ac_prog in  python3

-do

-  # Extract the first word of "$ac_prog", so it can be a program name with args.

-set dummy $ac_prog; ac_word=$2

+

+        if test -n "$PYTHON"; then

+      # If the user set $PYTHON, use it and don't search something else.

+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.0" >&5

+$as_echo_n "checking whether $PYTHON version is >= 3.0... " >&6; }

+      prog="import sys

+# split strings by '.' and convert to numeric.  Append some zeros

+# because we need at least 4 digits for the hex conversion.

+# map returns an iterator in Python 3.0 and a list in 2.x

+minver = list(map(int, '3.0'.split('.'))) + [0, 0, 0]

+minverhex = 0

+# xrange is not present in Python 3.0 and range returns an iterator

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

+sys.exit(sys.hexversion < minverhex)"

+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5

+   ($PYTHON -c "$prog") >&5 2>&5

+   ac_status=$?

+   echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); }; then :

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

+else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+			       as_fn_error $? "Python interpreter is too old" "$LINENO" 5

+fi

+      am_display_PYTHON=$PYTHON

+    else

+      # Otherwise, try each interpreter until we find one that satisfies

+      # VERSION.

+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.0" >&5

+$as_echo_n "checking for a Python interpreter with version >= 3.0... " >&6; }

+if ${am_cv_pathless_PYTHON+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+

+	for am_cv_pathless_PYTHON in python python2 python3  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3  python3.2 python3.1 python3.0  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1  python2.0 none; do

+	  test "$am_cv_pathless_PYTHON" = none && break

+	  prog="import sys

+# split strings by '.' and convert to numeric.  Append some zeros

+# because we need at least 4 digits for the hex conversion.

+# map returns an iterator in Python 3.0 and a list in 2.x

+minver = list(map(int, '3.0'.split('.'))) + [0, 0, 0]

+minverhex = 0

+# xrange is not present in Python 3.0 and range returns an iterator

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

+sys.exit(sys.hexversion < minverhex)"

+  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5

+   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5

+   ac_status=$?

+   echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); }; then :

+  break

+fi

+	done

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5

+$as_echo "$am_cv_pathless_PYTHON" >&6; }

+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.

+      if test "$am_cv_pathless_PYTHON" = none; then

+	PYTHON=:

+      else

+        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.

+set dummy $am_cv_pathless_PYTHON; ac_word=$2

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

 $as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_PYTHON3_BIN+:} false; then :

+if ${ac_cv_path_PYTHON+:} false; then :

   $as_echo_n "(cached) " >&6

 else

-  if test -n "$PYTHON3_BIN"; then

-  ac_cv_prog_PYTHON3_BIN="$PYTHON3_BIN" # Let the user override the test.

-else

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-as_dummy="${PATH}:/usr/bin:/usr/local/bin"

-for as_dir in $as_dummy

+  case $PYTHON in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

 do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

     for ac_exec_ext in '' $ac_executable_extensions; do

   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

-    ac_cv_prog_PYTHON3_BIN="$ac_prog"

+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

   fi

@@ -2869,708 +2923,358 @@ done

   done

 IFS=$as_save_IFS

+  ;;

+esac

 fi

-fi

-PYTHON3_BIN=$ac_cv_prog_PYTHON3_BIN

-if test -n "$PYTHON3_BIN"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON3_BIN" >&5

-$as_echo "$PYTHON3_BIN" >&6; }

+PYTHON=$ac_cv_path_PYTHON

+if test -n "$PYTHON"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5

+$as_echo "$PYTHON" >&6; }

 else

   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

 $as_echo "no" >&6; }

 fi

-  test -n "$PYTHON3_BIN" && break

-done

-test -n "$PYTHON3_BIN" || PYTHON3_BIN="not-found"

-

-	fi

-

-	if test "x$PYTHON3_BIN" = "xnot-found"; then

-		fail="python-binary"

-	fi

-

-		PY_LIB_DIR=

-

-# Check whether --with-rlm-python3-lib-dir was given.

-if test "${with_rlm_python3_lib_dir+set}" = set; then :

-  withval=$with_rlm_python3_lib_dir;  case "$withval" in

-	    no)

-		as_fn_error $? "Need rlm-python3-lib-dir" "$LINENO" 5

-		;;

-	    yes)

-		;;

-	    *)

-		PY_LIB_DIR="$withval"

-		;;

-	  esac

-

-fi

+      fi

+      am_display_PYTHON=$am_cv_pathless_PYTHON

+    fi

-		PY_INC_DIR=

+  if test "$PYTHON" = :; then

+      :

+  else

-# Check whether --with-rlm-python3-include-dir was given.

-if test "${with_rlm_python3_include_dir+set}" = set; then :

-  withval=$with_rlm_python3_include_dir;  case "$withval" in

-	    no)

-		as_fn_error $? "Need rlm-python3-include-dir" "$LINENO" 5

-		;;

-	    yes)

-		;;

-	    *)

-		PY_INC_DIR="$withval"

-		;;

-	  esac

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5

+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }

+if ${am_cv_python_version+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`

 fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5

+$as_echo "$am_cv_python_version" >&6; }

+  PYTHON_VERSION=$am_cv_python_version

-	if test x$fail = x; then

-		PY_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.prefix)'`

-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.prefix \"${PY_PREFIX}\"" >&5

-$as_echo "$as_me: Python sys.prefix \"${PY_PREFIX}\"" >&6;}

-

-		PY_EXEC_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.exec_prefix)'`

-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&5

-$as_echo "$as_me: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&6;}

-

-		PY_SYS_VERSION=`${PYTHON3_BIN} -c 'import sys ; print(sys.version[0:3])'`

-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.version \"${PY_SYS_VERSION}\"" >&5

-$as_echo "$as_me: Python sys.version \"${PY_SYS_VERSION}\"" >&6;}

-

-		if test "x$PY_LIB_DIR" = "x"; then

-			PY_LIB_DIR="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"

-			PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"

-		fi

-

-		PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config/Makefile"

-		if test -f ${PY_MAKEFILE}; then

-			PY_LOCAL_MOD_LIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[:blank:]]/ /g;s/^ *//;s/ *$//'`

-			{ $as_echo "$as_me:${as_lineno-$LINENO}: Python local_mod_libs \"${PY_LOCAL_MOD_LIBS}\"" >&5

-$as_echo "$as_me: Python local_mod_libs \"${PY_LOCAL_MOD_LIBS}\"" >&6;}

-

-			PY_BASE_MOD_LIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[:blank:]]/ /g;s/^ *//;s/ *$//'`

-			{ $as_echo "$as_me:${as_lineno-$LINENO}: Python base_mod_libs \"${PY_BASE_MOD_LIBS}\"" >&5

-$as_echo "$as_me: Python base_mod_libs \"${PY_BASE_MOD_LIBS}\"" >&6;}

-

-			PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[:blank:]]/ /g;s/  / /g;s/^ *//;s/ *$//'`

-			PY_OTHER_LDFLAGS=`sed -n -e 's/^LINKFORSHARED=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[:blank:]]/ /g;s/  / /g;s/^ *//;s/ *$//'`

-			{ $as_echo "$as_me:${as_lineno-$LINENO}: Python other_libs \"${PY_OTHER_LDFLAGS} ${PY_OTHER_LIBS}\"" >&5

-$as_echo "$as_me: Python other_libs \"${PY_OTHER_LDFLAGS} ${PY_OTHER_LIBS}\"" >&6;}

-		fi

-		PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASE_MOD_LIBS $PY_OTHER_LIBS"

-

-		old_CFLAGS=$CFLAGS

-		CFLAGS="$CFLAGS $PY_CFLAGS"

-		smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION"

-

+  PYTHON_PREFIX='${prefix}'

-ac_safe=`echo "Python.h" | sed 'y%./+-%__pm%'`

-old_CPPFLAGS="$CPPFLAGS"

-smart_include=

-smart_include_dir="/usr/local/include /opt/include"

+  PYTHON_EXEC_PREFIX='${exec_prefix}'

-_smart_try_dir=

-_smart_include_dir=

-for _prefix in $smart_prefix ""; do

-  for _dir in $smart_try_dir; do

-    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"

-  done

-

-  for _dir in $smart_include_dir; do

-    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"

-  done

-done

-

-if test "x$_smart_try_dir" != "x"; then

-  for try in $_smart_try_dir; do

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python.h in $try" >&5

-$as_echo_n "checking for Python.h in $try... " >&6; }

-    CPPFLAGS="-isystem $try $old_CPPFLAGS"

-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h.  */

-

-		    #include <Python.h>

-int

-main ()

-{

-int a = 1;

-  ;

-  return 0;

-}

-_ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :

-

-		     smart_include="-isystem $try"

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-$as_echo "yes" >&6; }

-		     break

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5

+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }

+if ${am_cv_python_platform+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

-

-		     smart_include=

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-

-fi

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-  done

-  CPPFLAGS="$old_CPPFLAGS"

-fi

-

-if test "x$smart_include" = "x"; then

-  for _prefix in $smart_prefix; do

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/Python.h" >&5

-$as_echo_n "checking for ${_prefix}/Python.h... " >&6; }

-

-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h.  */

-

-		    #include <Python.h>

-int

-main ()

-{

-int a = 1;

-  ;

-  return 0;

-}

-_ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :

-

-		     smart_include="-isystem ${_prefix}/"

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-$as_echo "yes" >&6; }

-		     break

-

+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5

+$as_echo "$am_cv_python_platform" >&6; }

+  PYTHON_PLATFORM=$am_cv_python_platform

+

+

+  # Just factor out some code duplication.

+  am_python_setup_sysconfig="\

+import sys

+# Prefer sysconfig over distutils.sysconfig, for better compatibility

+# with python 3.x.  See automake bug#10227.

+try:

+    import sysconfig

+except ImportError:

+    can_use_sysconfig = 0

+else:

+    can_use_sysconfig = 1

+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:

+# <https://github.com/pypa/virtualenv/issues/118>

+try:

+    from platform import python_implementation

+    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':

+        can_use_sysconfig = 0

+except ImportError:

+    pass"

+

+

+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5

+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }

+if ${am_cv_python_pythondir+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

+  if test "x$prefix" = xNONE

+     then

+       am_py_prefix=$ac_default_prefix

+     else

+       am_py_prefix=$prefix

+     fi

+     am_cv_python_pythondir=`$PYTHON -c "

+$am_python_setup_sysconfig

+if can_use_sysconfig:

+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})

+else:

+    from distutils import sysconfig

+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')

+sys.stdout.write(sitedir)"`

+     case $am_cv_python_pythondir in

+     $am_py_prefix*)

+       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

+       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`

+       ;;

+     *)

+       case $am_py_prefix in

+         /usr|/System*) ;;

+         *)

+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages

+	  ;;

+       esac

+       ;;

+     esac

-		     smart_include=

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-

-fi

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-  done

 fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5

+$as_echo "$am_cv_python_pythondir" >&6; }

+  pythondir=$am_cv_python_pythondir

-if test "x$smart_include" = "x"; then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python.h" >&5

-$as_echo_n "checking for Python.h... " >&6; }

-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h.  */

-		    #include <Python.h>

-int

-main ()

-{

-int a = 1;

-  ;

-  return 0;

-}

-_ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :

+  pkgpythondir=\${pythondir}/$PACKAGE

-		     smart_include=" "

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-$as_echo "yes" >&6; }

-		     break

+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5

+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }

+if ${am_cv_python_pyexecdir+:} false; then :

+  $as_echo_n "(cached) " >&6

 else

-

-		     smart_include=

-		     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

+  if test "x$exec_prefix" = xNONE

+     then

+       am_py_exec_prefix=$am_py_prefix

+     else

+       am_py_exec_prefix=$exec_prefix

+     fi

+     am_cv_python_pyexecdir=`$PYTHON -c "

+$am_python_setup_sysconfig

+if can_use_sysconfig:

+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})

+else:

+    from distutils import sysconfig

+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')

+sys.stdout.write(sitedir)"`

+     case $am_cv_python_pyexecdir in

+     $am_py_exec_prefix*)

+       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

+       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`

+       ;;

+     *)

+       case $am_py_exec_prefix in

+         /usr|/System*) ;;

+         *)

+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages

+	   ;;

+       esac

+       ;;

+     esac

 fi

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-fi

-

-if test "x$smart_include" = "x"; then

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5

+$as_echo "$am_cv_python_pyexecdir" >&6; }

+  pyexecdir=$am_cv_python_pyexecdir

-  for prefix in $smart_prefix; do

-if test "x$LOCATE" != "x"; then

-        DIRS=

-  file="${_prefix}/${1}"

+  pkgpyexecdir=\${pyexecdir}/$PACKAGE

-  for x in `${LOCATE} $file 2>/dev/null`; do

-                                        base=`echo $x | sed "s%/${file}%%"`

-    if test "x$x" = "x$base"; then

-      continue;

-    fi

-

-    dir=`${DIRNAME} $x 2>/dev/null`

-                exclude=`echo ${dir} | ${GREP} /home`

-    if test "x$exclude" != "x"; then

-      continue

-    fi

-

-                    already=`echo \$_smart_include_dir ${DIRS} | ${GREP} ${dir}`

-    if test "x$already" = "x"; then

-      DIRS="$DIRS $dir"

-    fi

-  done

-fi

-eval "_smart_include_dir=\"\$_smart_include_dir $DIRS\""

-  done

+  fi

-if test "x$LOCATE" != "x"; then

-        DIRS=

-  file=Python.h

-  for x in `${LOCATE} $file 2>/dev/null`; do

-                                        base=`echo $x | sed "s%/${file}%%"`

-    if test "x$x" = "x$base"; then

-      continue;

-    fi

+		PYTHON3_CONFIG_BIN=