# HG changeset patch
# User Andreas Behr <andreas@codedreality.com>
# Date 1307749420 -7200
# Node ID 7d0ecadd687348ef6233a0e64f70c3f9ebf57acc
# Parent  e9538cfd0d9ca8e5024bbfc205a2789199bef42d
Adds support for python 3.x

diff -r e9538cfd0d9c -r 7d0ecadd6873 src/configure.in
--- a/src/configure.in	Wed May 25 21:18:06 2011 +0200
+++ b/src/configure.in	Sat Jun 11 01:43:40 2011 +0200
@@ -992,6 +992,17 @@
           ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'`
     ]])
 
+    dnl -- get abiflags for python 3.2 or higher (PEP 3149)
+    AC_CACHE_CHECK(Python's abiflags,vi_cv_var_python3_abiflags,
+    [
+     vi_cv_var_python3_abiflags=
+     if ${vi_cv_path_python3} -c \
+         "import sys; sys.exit(${vi_cv_var_python3_version} < 3.2)"
+     then
+       vi_cv_var_python3_abiflags=`${vi_cv_path_python3} -c \    
+         "import sys; print(sys.abiflags)"`
+     fi ])
+
     dnl -- find where python3 thinks it was installed
     AC_CACHE_CHECK(Python's install prefix,vi_cv_path_python3_pfx,
     [ vi_cv_path_python3_pfx=`
@@ -1021,9 +1032,13 @@
     AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
     [
      vi_cv_path_python3_conf=
+     config_dir="config"
+     if test "${vi_cv_var_python3_abiflags}" != ""; then
+       config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
+     fi
      for path in "${vi_cv_path_python3_pfx}" "${vi_cv_path_python3_epfx}"; do
        for subdir in lib64 lib share; do
-         d="${path}/${subdir}/python${vi_cv_var_python3_version}/config"
+         d="${path}/${subdir}/python${vi_cv_var_python3_version}/${config_dir}"
          if test -d "$d" && test -f "$d/config.c"; then
            vi_cv_path_python3_conf="$d"
          fi
@@ -1055,7 +1070,7 @@
           eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
           rm -f -- "${tmp_mkf}"
           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
-          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS} ${python3_LINKFORSHARED}"
+          vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
           dnl remove -ltermcap, it can conflict with an earlier -lncurses
           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
@@ -1063,9 +1078,9 @@
 
       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       else
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       fi
       PYTHON3_SRC="if_python3.c"
       dnl For Mac OSX 10.2 config.o is included in the Python library.
diff -r e9538cfd0d9c -r 7d0ecadd6873 src/if_python3.c
--- a/src/if_python3.c	Wed May 25 21:18:06 2011 +0200
+++ b/src/if_python3.c	Sat Jun 11 01:43:40 2011 +0200
@@ -547,15 +547,15 @@
 	Py_SetPythonHome(PYTHON3_HOME);
 #endif
 
-	/* initialise threads */
-	PyEval_InitThreads();
-
 #if !defined(MACOS) || defined(MACOS_X_UNIX)
 	Py_Initialize();
 #else
 	PyMac_Initialize();
 #endif
 
+        /* initialise threads */
+        PyEval_InitThreads();
+
 #ifdef DYNAMIC_PYTHON3
 	get_py3_exceptions();
 #endif