[Python-checkins] CVS: python/dist/src configure.in,1.265,1.266 configure,1.257,1.258

2001年10月08日 06:17:30 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv5700
Modified Files:
	configure.in configure 
Log Message:
Provide explicit program when trying to link pthread_create.
Contributed by Albert Chin in discussion of bug #210665.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.265
retrieving revision 1.266
diff -C2 -d -r1.265 -r1.266
*** configure.in	2001年10月07日 08:39:18	1.265
--- configure.in	2001年10月08日 13:17:28	1.266
***************
*** 953,957 ****
 LIBOBJS="$LIBOBJS thread.o"],[
 AC_MSG_RESULT(no)
! AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
 case $ac_sys_system in
 Darwin*) ;;
--- 953,969 ----
 LIBOBJS="$LIBOBJS 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.
! _libs=$LIBS
! LIBS="$LIBS -lpthread"
! AC_MSG_CHECKING([for pthread_create in -lpthread])
! AC_TRY_LINK([#include <pthread.h>
! 
! void * start_routine (void *arg) { exit (0); }], [
! pthread_create (NULL, NULL, start_routine, NULL)], [
! AC_MSG_RESULT(yes)
! AC_DEFINE(WITH_THREAD)
 case $ac_sys_system in
 Darwin*) ;;
***************
*** 960,965 ****
 ;;
 esac
- LIBS="-lpthread $LIBS"
 LIBOBJS="$LIBOBJS thread.o"],[
 AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
 case $ac_sys_system in
--- 972,977 ----
 ;;
 esac
 LIBOBJS="$LIBOBJS thread.o"],[
+ LIBS=$_libs
 AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
 case $ac_sys_system in
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.257
retrieving revision 1.258
diff -C2 -d -r1.257 -r1.258
*** configure	2001年10月07日 08:39:18	1.257
--- configure	2001年10月08日 13:17:28	1.258
***************
*** 1,5 ****
 #! /bin/sh
 
! # From configure.in Revision: 1.264 
 
 # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
 #! /bin/sh
 
! # From configure.in Revision: 1.265 
 
[...2678 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 7179 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
***************
*** 7235,7239 ****
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7238: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
--- 7225,7229 ----
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7228: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then