[Python-checkins] r75684 - in python/branches/py3k: Python/thread.c configure configure.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Oct 24 22:35:52 2009
New Revision: 75684

Log:
Disable GNU pth support



Modified:
   python/branches/py3k/Python/thread.c
   python/branches/py3k/configure
   python/branches/py3k/configure.in

Modified: python/branches/py3k/Python/thread.c
==============================================================================
--- python/branches/py3k/Python/thread.c	(original)
+++ python/branches/py3k/Python/thread.c	Sat Oct 24 22:35:52 2009
@@ -114,6 +114,7 @@
 #endif
 
 #ifdef HAVE_PTH
+#error GNU pth threads are now unsupported, and code will be removed in 3.3.
 #include "thread_pth.h"
 #undef _POSIX_THREADS
 #endif

Modified: python/branches/py3k/configure
==============================================================================
--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Sat Oct 24 22:35:52 2009
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 74979 .
+# From configure.in Revision: 75678 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -1352,7 +1352,6 @@
                           disable/enable thread support
   --with(out)-thread[=DIRECTORY]
                           deprecated; use --with(out)-threads
-  --with-pth              use GNU pth threading libraries
   --with(out)-doc-strings disable/enable documentation strings
   --with(out)-tsc         enable/disable timestamp counter profile
   --with(out)-pymalloc    disable/enable specialized mallocs
@@ -15843,28 +15842,6 @@
     THREADOBJ="Python/thread.o"
 else
 
-    { echo "$as_me:$LINENO: checking for --with-pth" >&5
-echo $ECHO_N "checking for --with-pth... $ECHO_C" >&6; }
-
-# Check whether --with-pth was given.
-if test "${with_pth+set}" = set; then
-  withval=$with_pth; { echo "$as_me:$LINENO: result: $withval" >&5
-echo "${ECHO_T}$withval" >&6; }
-                  cat >>confdefs.h <<\_ACEOF
-#define WITH_THREAD 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTH 1
-_ACEOF
-
-                  LIBS="-lpth $LIBS"
-                  THREADOBJ="Python/thread.o"
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
     # Just looking for pthread_create in libpthread is not enough:
     # on HP/UX, pthread.h renames pthread_create to a different symbol name.
     # So we really have to include pthread.h, and then link.
@@ -16315,8 +16292,6 @@
       conftest$ac_exeext conftest.$ac_ext
 fi
 
-fi
-
 
 fi
 

Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Sat Oct 24 22:35:52 2009
@@ -2018,17 +2018,6 @@
     AC_DEFINE(MACH_C_THREADS, 1,
     [Define if you are using Mach cthreads under mach /])
     THREADOBJ="Python/thread.o"],[
-    AC_MSG_CHECKING(for --with-pth)
-    AC_ARG_WITH([pth],
-                AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
-                [AC_MSG_RESULT($withval)
-                  AC_DEFINE([WITH_THREAD])
-                  AC_DEFINE([HAVE_PTH], 1,
-                            [Define if you have GNU PTH threads.])
-                  LIBS="-lpth $LIBS"
-                  THREADOBJ="Python/thread.o"],
-	        [AC_MSG_RESULT(no)
-
     # Just looking for pthread_create in libpthread is not enough:
     # on HP/UX, pthread.h renames pthread_create to a different symbol name.
     # So we really have to include pthread.h, and then link.
@@ -2064,7 +2053,7 @@
     LIBS="$LIBS -lcma"
     THREADOBJ="Python/thread.o"],[
     USE_THREAD_MODULE="#"])
-    ])])])])])])])])
+    ])])])])])])])
 
     AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
     LIBS="$LIBS -lmpc"