[Python-checkins] python/dist/src configure,1.279.6.12,1.279.6.13 configure.in,1.288.6.12,1.288.6.13 pyconfig.h.in,1.20.8.1,1.20.8.2

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv28942

Modified Files:
      Tag: release22-maint
	configure configure.in pyconfig.h.in 
Log Message:
Patch #618347: Work around Solaris pthread.h bug.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.279.6.12
retrieving revision 1.279.6.13
diff -C2 -d -r1.279.6.12 -r1.279.6.13
*** configure	30 Sep 2002 16:17:54 -0000	1.279.6.12
--- configure	4 Oct 2002 10:16:24 -0000	1.279.6.13
***************
*** 4383,4391 ****
          esac
      fi
  fi
  
  # Check for enable-ipv6
  echo $ac_n "checking if --enable-ipv6 is specified""... $ac_c" 1>&6
! echo "configure:4390: checking if --enable-ipv6 is specified" >&5
  # Check whether --enable-ipv6 or --disable-ipv6 was given.
  if test "${enable_ipv6+set}" = set; then
--- 4383,4401 ----
[...2375 lines suppressed...]
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7534 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7577,7581 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7580: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7587,7591 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7590: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.288.6.12
retrieving revision 1.288.6.13
diff -C2 -d -r1.288.6.12 -r1.288.6.13
*** configure.in	30 Sep 2002 16:16:11 -0000	1.288.6.12
--- configure.in	4 Oct 2002 10:16:27 -0000	1.288.6.13
***************
*** 1171,1174 ****
--- 1171,1182 ----
          esac
      fi
+ 
+     if test "$posix_threads" = yes -a \
+ 		"$ac_sys_system" = "SunOS" -a \
+ 		"$ac_sys_release" = "5.6"; then
+ 		AC_DEFINE(HAVE_PTHREAD_DESTRUCTOR, 1,
+ 		[Defined for Solaris 2.6 bug in pthread header.])
+ 	fi
+ 
  fi
  

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.20.8.1
retrieving revision 1.20.8.2
diff -C2 -d -r1.20.8.1 -r1.20.8.2
*** pyconfig.h.in	30 Sep 2002 10:10:22 -0000	1.20.8.1
--- pyconfig.h.in	4 Oct 2002 10:16:27 -0000	1.20.8.2
***************
*** 751,754 ****
--- 751,758 ----
  #undef HAVE_LIBIEEE
  
+ /* Defined for Solaris 2.6 bug in pthread header. */
+ #undef HAVE_PTHREAD_DESTRUCTOR
+ 
+ 
  #ifdef __CYGWIN__
  #ifdef USE_DL_IMPORT