[Python-checkins] CVS: python/dist/src configure.in,1.121.2.1,1.121.2.2 configure,1.113.2.1,1.113.2.2

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10958

Modified Files:
      Tag: cnri-16-start
	configure.in configure 
Log Message:

Merged patch 1.132->1.133 into Python 1.6 branch; this avoids use of GNU
Pth pthreads implementation when something else is available (such as
LinuxThreads).  GNU Pth is not sufficiently stable to be preferred over
other implementations.

Patch contributed by Gregor Hoffleit <flight@users.sourceforge.net>.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.121.2.1
retrieving revision 1.121.2.2
diff -C2 -r1.121.2.1 -r1.121.2.2
*** configure.in	2000/08/10 03:52:03	1.121.2.1
--- configure.in	2000/08/10 18:13:25	1.121.2.2
***************
*** 655,662 ****
  AC_DEFINE(C_THREADS)
  LIBOBJS="$LIBOBJS thread.o"],[
- AC_CHECK_LIB(pth, pth_init, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(_GNU_PTH)
- LIBS="-lpth $LIBS"
- LIBOBJS="$LIBOBJS thread.o"],[
  AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
  AC_DEFINE(_POSIX_THREADS)
--- 655,658 ----
***************
*** 681,684 ****
--- 677,684 ----
  LIBS="$LIBS -lthread"
  LIBOBJS="$LIBOBJS thread.o"], [
+ AC_CHECK_LIB(pth, pth_init, [AC_DEFINE(WITH_THREAD)
+ AC_DEFINE(_GNU_PTH)
+ LIBS="-lpth $LIBS"
+ LIBOBJS="$LIBOBJS thread.o"],[
  AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
  AC_DEFINE(_POSIX_THREADS)

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.113.2.1
retrieving revision 1.113.2.2
diff -C2 -r1.113.2.1 -r1.113.2.2
*** configure	2000/08/10 03:52:03	1.113.2.1
--- configure	2000/08/10 18:13:25	1.113.2.2
***************
*** 1,8 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.121 
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
--- 1,8 ----
  #! /bin/sh
[...3675 lines suppressed...]
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
--- 5398,5402 ----
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
***************
*** 5673,5676 ****
  chmod +x $CONFIG_STATUS
  rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
  
--- 5696,5699 ----
  chmod +x $CONFIG_STATUS
  rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1