Prevent threaded python build on BSD's, where it fails.

Marko Kreen

diff --git a/config/python.m4 b/config/python.m4
index 17dd085b971786f9a92d0e7d7b1b2fff33cf9b8c..40792a3650e3b813679e235a9e8fc85cea8e8043 100644 (file)
--- a/config/python.m4
+++ b/config/python.m4
@@ -1,7 +1,7 @@
 #
 # Autoconf macros for configuring the build of Python extension modules
 #
-# $PostgreSQL: pgsql/config/python.m4,v 1.11 2004/10/11 19:32:16 tgl Exp $
+# $PostgreSQL: pgsql/config/python.m4,v 1.12 2005/09/26 16:48:28 momjian Exp $
 #
 
 # PGAC_PATH_PYTHON
@@ -77,4 +77,19 @@ AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
 AC_SUBST(python_libdir)[]dnl
 AC_SUBST(python_libspec)[]dnl
 AC_SUBST(python_additional_libs)[]dnl
+
+# threaded python is not supported on bsd's
+AC_MSG_CHECKING(whether Python is compiled with thread support)
+pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
+if test "$pythreads" = "1"; then
+  AC_MSG_RESULT(yes)
+  case $host_os in
+  openbsd*|freebsd*)
+    AC_MSG_ERROR([*** Threaded Python not supported on this platform ***])
+    ;;
+  esac
+else
+  AC_MSG_RESULT(no)
+fi
+
 ])# PGAC_CHECK_PYTHON_EMBED_SETUP

diff --git a/configure b/configure
index 23071b03041ed369fd157d5dcee324e0132cbab6..e58189c81bacd64e0839424742b58f7202f792b7 100755 (executable)
--- a/configure
+++ b/configure
@@ -4743,6 +4743,26 @@ echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5
 echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6
 
 
+# threaded python is not supported on bsd's
+echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
+echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6
+pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
+if test "$pythreads" = "1"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  case $host_os in
+  openbsd*|freebsd*)
+    { { echo "$as_me:$LINENO: error: *** Threaded Python not supported on this platform ***" >&5
+echo "$as_me: error: *** Threaded Python not supported on this platform ***" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+  esac
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
 fi