[Python-checkins] CVS: python/dist/src configure.in,1.229,1.230 configure,1.221,1.222 Makefile.pre.in,1.41,1.42
Martin v. L?wis
loewis@users.sourceforge.net
2001年7月19日 04:00:44 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv20292
Modified Files:
configure.in configure Makefile.pre.in
Log Message:
Patch #418659: Fixes for UnixWare and ReliantUnix.
back-out 1.215 of configure.in and 1.34 of Makefile.pre.in
Check for -Kpthread compiler support, and use this as the sole option
for MT if available.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -r1.229 -r1.230
*** configure.in 2001年07月18日 16:24:30 1.229
--- configure.in 2001年07月19日 11:00:40 1.230
***************
*** 53,59 ****
then
ac_sys_system=`uname -s`
! if test "$ac_sys_system" = "AIX" -o \
! "$ac_sys_system" = "Monterey64" -o \
! "$ac_sys_system" = "UnixWare"; then
ac_sys_release=`uname -v`
else
--- 53,57 ----
then
ac_sys_system=`uname -s`
! if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
ac_sys_release=`uname -v`
else
***************
*** 128,140 ****
Monterey*)
RANLIB=:
! without_gcc=
! ;;
! UnixWare*)
! RANLIB=:
! without_gcc=
! ;;
! *)
! without_gcc=no
! ;;
esac])
AC_MSG_RESULT($without_gcc)
--- 126,131 ----
Monterey*)
RANLIB=:
! without_gcc=;;
! *) without_gcc=no;;
esac])
AC_MSG_RESULT($without_gcc)
***************
*** 274,280 ****
DLLLIBRARY='libpython$(VERSION).dll'
;;
- unixware*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
esac
AC_MSG_RESULT($LDLIBRARY)
--- 265,268 ----
***************
*** 531,534 ****
--- 519,540 ----
fi
+ # -Kpthread, if available, provides the right #defines
+ # and linker options to make pthread_create available
+ AC_MSG_CHECKING(whether $CC accepts -Kpthread)
+ AC_CACHE_VAL(ac_cv_kpthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kpthread"
+ AC_TRY_LINK([#include <pthread.h>],[pthread_create(0,0,0,0)],
+ ac_cv_kpthread=yes,
+ ac_cv_kpthread=no)
+ CC="$ac_save_cc"])
+
+ # GCC does not reject -Kpthread as an illegal option, it merely complains that
+ # it is unrecognized
+ if test "$GCC" = "yes"
+ then ac_cv_kpthread="no, we have gcc"
+ fi
+ AC_MSG_RESULT($ac_cv_kpthread)
+
dnl # check for ANSI or K&R ("traditional") preprocessor
dnl AC_MSG_CHECKING(for C preprocessor type)
***************
*** 780,784 ****
if test "$GCC" = "yes"
then LDSHARED="$(CC) -shared"
! else LDSHARED="ld -G -dy -Bdynamic"
fi;;
SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
--- 786,790 ----
if test "$GCC" = "yes"
then LDSHARED="$(CC) -shared"
! else LDSHARED="$(CC) -G"
fi;;
SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
***************
*** 810,814 ****
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
! else CCSHARED="-KPIC -G -dy -Bdynamic"
fi;;
SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
--- 816,820 ----
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
! else CCSHARED="-KPIC"
fi;;
SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
***************
*** 841,845 ****
next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
! UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
--- 847,851 ----
next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
! UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
***************
*** 965,1049 ****
then
USE_THREAD_MODULE="#"
else
! if test "$ac_sys_system" = "UnixWare"
! then
! CC="${CC} -Kthread"
! LIBOBJS="$LIBOBJS thread.o"
! AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! USE_THREAD_MODULE=""
! else
! if test ! -z "$with_threads" -a -d "$with_threads"
! then LDFLAGS="$LDFLAGS -L$with_threads"
! fi
! if test ! -z "$withval" -a -d "$withval"
! then LDFLAGS="$LDFLAGS -L$withval"
! fi
! AC_DEFINE(_REENTRANT)
! AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(C_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_CHECKING(for --with-pth)
! AC_ARG_WITH(pth,
! [ --with-pth use GNU pth threading libraries], [
! AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_THREAD)
! AC_DEFINE(HAVE_PTH)
! LIBS="-lpth $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_RESULT(no)
! AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="-lpthread $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! case $ac_sys_system in
! Darwin*) ;;
! *) AC_DEFINE(_POSIX_THREADS);;
! esac
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(BEOS_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthreads"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lc_r"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"],[
! USE_THREAD_MODULE="#"])
! ])])])])])])])])])
!
! AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
! AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
!
! if test "$USE_THREAD_MODULE" != "#"
! then
! # If the above checks didn't disable threads, (at least) OSF1
! # needs this '-threads' argument during linking.
! case $ac_sys_system in
! OSF1) LDLAST=-threads;;
! esac
! fi
fi
fi
--- 971,1052 ----
then
USE_THREAD_MODULE="#"
+ elif test "$ac_cv_kpthread" = "yes"
+ then
+ CC="$CC -Kpthread"
+ AC_DEFINE(WITH_THREAD)
+ AC_DEFINE(_POSIX_THREADS)
+ LIBOBJS="$LIBOBJS thread.o"
else
! if test ! -z "$with_threads" -a -d "$with_threads"
! then LDFLAGS="$LDFLAGS -L$with_threads"
! fi
! if test ! -z "$withval" -a -d "$withval"
! then LDFLAGS="$LDFLAGS -L$withval"
! fi
! AC_DEFINE(_REENTRANT)
! AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(C_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_CHECKING(for --with-pth)
! AC_ARG_WITH(pth,
! [ --with-pth use GNU pth threading libraries], [
! AC_MSG_RESULT($withval)
! AC_DEFINE(WITH_THREAD)
! AC_DEFINE(HAVE_PTH)
! LIBS="-lpth $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_MSG_RESULT(no)
! AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="-lpthread $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! case $ac_sys_system in
! Darwin*) ;;
! *) AC_DEFINE(_POSIX_THREADS);;
! esac
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(BEOS_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthreads"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lc_r"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lpthread"
! LIBOBJS="$LIBOBJS thread.o"], [
! AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"],[
! USE_THREAD_MODULE="#"])
! ])])])])])])])])])
!
! AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
! AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"
! USE_THREAD_MODULE=""])
!
! if test "$USE_THREAD_MODULE" != "#"
! then
! # If the above checks didn't disable threads, (at least) OSF1
! # needs this '-threads' argument during linking.
! case $ac_sys_system in
! OSF1) LDLAST=-threads;;
! esac
fi
fi
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.221
retrieving revision 1.222
diff -C2 -r1.221 -r1.222
*** configure 2001年07月18日 16:24:30 1.221
--- configure 2001年07月19日 11:00:40 1.222
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.228
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.229
[...5030 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 6951 "configure"
#include "confdefs.h"
#include <sys/types.h>
***************
*** 6974,6978 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6977: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 6997,7001 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7000: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** Makefile.pre.in 2001年07月19日 09:34:09 1.41
--- Makefile.pre.in 2001年07月19日 11:00:41 1.42
***************
*** 315,319 ****
$(RANLIB) $@
! # This rule is only here for DG/UX, UnixWare, and BeOS!!!
libpython$(VERSION).so: $(LIBRARY)
case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
--- 315,319 ----
$(RANLIB) $@
! # This rule is only here for DG/UX and BeOS!!!
libpython$(VERSION).so: $(LIBRARY)
case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
***************
*** 322,328 ****
(cd dgux;ar x ../$^;ld -G -o ../$@ * ); \
/bin/rm -rf ./dgux \
- ;; \
- unixware*) \
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) \
;; \
beos) \
--- 322,325 ----