[Python-checkins] CVS: python/dist/src config.h.in,2.56,2.57 configure,1.118,1.119 configure.in,1.126,1.127
Barry Warsaw
python-dev@python.org
Thu, 29 Jun 2000 09:12:03 -0700
Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2286
Modified Files:
config.h.in configure configure.in
Log Message:
Thread support is turned on my default now. To disable building
threads use --without-threads. No extra tests of thread/compiler
combinations have been added.
--with(out)-thread and --with(out)-threads are completely
interchangeable.
--with-threads still supports the =DIRECTORY option for specifying
where to find thread libraries.
Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.56
retrieving revision 2.57
diff -C2 -r2.56 -r2.57
*** config.h.in 2000/06/18 15:07:40 2.56
--- config.h.in 2000/06/29 16:12:00 2.57
***************
*** 286,289 ****
--- 286,292 ----
#undef HAVE_FORK
+ /* Define if you have the forkpty function. */
+ #undef HAVE_FORKPTY
+
/* Define if you have the fpathconf function. */
#undef HAVE_FPATHCONF
***************
*** 367,370 ****
--- 370,376 ----
#undef HAVE_NICE
+ /* Define if you have the openpty function. */
+ #undef HAVE_OPENPTY
+
/* Define if you have the pathconf function. */
#undef HAVE_PATHCONF
***************
*** 484,487 ****
--- 490,496 ----
#undef HAVE_FCNTL_H
+ /* Define if you have the <libutil.h> header file. */
+ #undef HAVE_LIBUTIL_H
+
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
***************
*** 498,501 ****
--- 507,513 ----
/* Define if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
+
+ /* Define if you have the <pty.h> header file. */
+ #undef HAVE_PTY_H
/* Define if you have the <signal.h> header file. */
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** configure 2000/06/28 16:40:38 1.118
--- configure 2000/06/29 16:12:00 1.119
***************
*** 1,8 ****
#! /bin/sh
! # From configure.in Revision: 1.125
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.14.1
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
--- 1,8 ----
#! /bin/sh
[...4155 lines suppressed...]
! echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
exit 0 ;;
-help | --help | --hel | --he | --h)
--- 5651,5655 ----
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.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
***************
*** 5971,5974 ****
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
--- 5949,5952 ----
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -r1.126 -r1.127
*** configure.in 2000/06/28 16:40:38 1.126
--- configure.in 2000/06/29 16:12:00 1.127
***************
*** 14,18 ****
AC_MSG_CHECKING(for --with-next-archs)
AC_ARG_WITH(next-archs,
! [--with-next-archs='arch1 arch2 ..' build MAB binary], [
if test -n "$withval"; then
ac_arch_flags=`/usr/lib/arch_tool -archify_list $withval`
--- 14,18 ----
AC_MSG_CHECKING(for --with-next-archs)
AC_ARG_WITH(next-archs,
! [ --with-next-archs='arch1 arch2 ..' build MAB binary], [
if test -n "$withval"; then
ac_arch_flags=`/usr/lib/arch_tool -archify_list $withval`
***************
*** 34,40 ****
AC_ARG_WITH(next-framework,
! [--with-next-framework Build (OpenStep|Rhapsody|MacOS10) framework],,)
! AC_ARG_WITH(dyld,
! [--with-dyld Use (OpenStep|Rhapsody|MacOS10) dynamic linker],,)
# Set name for machine-dependent library files
--- 34,40 ----
AC_ARG_WITH(next-framework,
! [ --with-next-framework Build (OpenStep|Rhapsody|MacOSX) framework],,)
! AC_ARG_WITH(dyld,
! [ --with-dyld Use (OpenStep|Rhapsody|MacOSX) dynamic linker],,)
# Set name for machine-dependent library files
***************
*** 100,104 ****
# checks for alternative programs
AC_MSG_CHECKING(for --without-gcc)
! AC_ARG_WITH(gcc, [--without-gcc never use gcc], [
case $withval in
no) CC=cc
--- 100,104 ----
# checks for alternative programs
AC_MSG_CHECKING(for --without-gcc)
! AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [
case $withval in
no) CC=cc
***************
*** 157,161 ****
MAINOBJ=python.o
AC_MSG_CHECKING(for --with-cxx=<compiler>)
! AC_ARG_WITH(cxx, [--with-cxx=<compiler> enable C++ support],[
case $withval in
no) CXX=
--- 157,161 ----
MAINOBJ=python.o
AC_MSG_CHECKING(for --with-cxx=<compiler>)
! AC_ARG_WITH(cxx, [ --with-cxx=<compiler> enable C++ support],[
case $withval in
no) CXX=
***************
*** 613,617 ****
AC_MSG_CHECKING(for --with-libs)
! AC_ARG_WITH(libs, [--with-libs='lib1 ...' link against additional libs], [
AC_MSG_RESULT($withval)
LIBS="$withval $LIBS"
--- 613,618 ----
AC_MSG_CHECKING(for --with-libs)
! AC_ARG_WITH(libs,
! [ --with-libs='lib1 ...' link against additional libs], [
AC_MSG_RESULT($withval)
LIBS="$withval $LIBS"
***************
*** 620,624 ****
AC_MSG_CHECKING(for --with(out)-readline)
AC_ARG_WITH(readline,
! [--with(out)-readline obsolete, edit Modules/Setup instead],
[AC_MSG_RESULT($withval)
AC_ERROR(--with(out)-readline is obsolete, edit Modules/Setup instead)],
--- 621,625 ----
AC_MSG_CHECKING(for --with(out)-readline)
AC_ARG_WITH(readline,
! [ --with(out)-readline obsolete, edit Modules/Setup instead],
[AC_MSG_RESULT($withval)
AC_ERROR(--with(out)-readline is obsolete, edit Modules/Setup instead)],
***************
*** 626,636 ****
AC_SUBST(USE_THREAD_MODULE)
! USE_THREAD_MODULE="#"
AC_MSG_CHECKING(for --with-dec-threads)
AC_SUBST(LDLAST)
AC_ARG_WITH(dec-threads,
! [--with-dec-threads use DEC Alpha/OSF1 thread-safe libraries],
! [AC_MSG_RESULT($withval)
LDLAST=-threads
if test "${with_thread+set}" != set; then
--- 627,637 ----
AC_SUBST(USE_THREAD_MODULE)
! USE_THREAD_MODULE=""
AC_MSG_CHECKING(for --with-dec-threads)
AC_SUBST(LDLAST)
AC_ARG_WITH(dec-threads,
! [ --with-dec-threads use DEC Alpha/OSF1 thread-safe libraries], [
! AC_MSG_RESULT($withval)
LDLAST=-threads
if test "${with_thread+set}" != set; then
***************
*** 640,700 ****
AC_MSG_CHECKING(for --with-threads)
! AC_ARG_WITH(threads, [--with-threads alias for --with-thread],
! [AC_MSG_RESULT($withval)
! if test "${with_thread+set}" != set; then
! with_thread="$withval";
! fi],
! AC_MSG_RESULT(no))
! AC_MSG_CHECKING(for --with-thread)
! AC_ARG_WITH(thread, [--with-thread[=DIRECTORY] make interpreter thread-safe], [
! USE_THREAD_MODULE=
! AC_MSG_RESULT($withval)
! if test -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_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)
! LIBS="-lpthread $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! 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(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"])
! ])])])])])])])])
!
! AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"])
! AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"])
! ], AC_MSG_RESULT(no))
# -I${DLINCLDIR} is added to the compile rule for importdl.o
--- 641,708 ----
AC_MSG_CHECKING(for --with-threads)
! AC_ARG_WITH(threads,
! [ --with(out)-threads[=DIRECTORY] disable/enable thread support])
! # --with-thread is deprecated, but check for it anyway
! AC_ARG_WITH(thread,,[with_threads=$with_thread])
!
! if test -z "$with_threads"
! then with_threads="yes"
fi
! AC_MSG_RESULT($with_threads)
!
! if test "$with_threads" = "no"
! then
! USE_THREAD_MODULE="#"
! else
! if test -d "$with_threads"
! then LDFLAGS="$LDFLAGS -L$with_threads"
! fi
! if test -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_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)
! LIBS="-lpthread $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
! AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! 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(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! AC_DEFINE(_POSIX_THREADS)
! LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"])
! ])])])])])])])])
!
! AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"])
! AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"])
! fi
# -I${DLINCLDIR} is added to the compile rule for importdl.o
***************
*** 703,707 ****
AC_MSG_CHECKING(for --with-sgi-dl)
! AC_ARG_WITH(sgi-dl, [--with-sgi-dl=DIRECTORY IRIX 4 dynamic linking], [
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_SGI_DL)
--- 711,716 ----
AC_MSG_CHECKING(for --with-sgi-dl)
! AC_ARG_WITH(sgi-dl,
! [ --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking], [
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_SGI_DL)
***************
*** 716,720 ****
AC_MSG_CHECKING(for --with-dl-dld)
! AC_ARG_WITH(dl-dld, [--with-dl-dld=DL_DIR,DLD_DIR GNU dynamic linking], [
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_DL_DLD)
--- 725,729 ----
AC_MSG_CHECKING(for --with-dl-dld)
! AC_ARG_WITH(dl-dld, [ --with-dl-dld=DL_DIR,DLD_DIR GNU dynamic linking], [
AC_MSG_RESULT($withval)
AC_DEFINE(WITH_DL_DLD)
***************
*** 959,963 ****
# Check for --with-fpectl
AC_MSG_CHECKING(for --with-fpectl)
! AC_ARG_WITH(fpectl, [--with-fpectl enable SIGFPE catching], [
if test "$withval" != no
then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
--- 968,973 ----
# Check for --with-fpectl
AC_MSG_CHECKING(for --with-fpectl)
! AC_ARG_WITH(fpectl,
! [ --with-fpectl enable SIGFPE catching], [
if test "$withval" != no
then AC_DEFINE(WANT_SIGFPE_HANDLER) AC_MSG_RESULT(yes)
***************
*** 974,978 ****
esac
AC_MSG_CHECKING(for --with-libm=STRING)
! AC_ARG_WITH(libm, [--with-libm=STRING math library], [
if test "$withval" = no
then LIBM=
--- 984,988 ----
esac
AC_MSG_CHECKING(for --with-libm=STRING)
! AC_ARG_WITH(libm, [ --with-libm=STRING math library], [
if test "$withval" = no
then LIBM=
***************
*** 988,992 ****
AC_SUBST(LIBC)
AC_MSG_CHECKING(for --with-libc=STRING)
! AC_ARG_WITH(libc, [--with-libc=STRING C library], [
if test "$withval" = no
then LIBC=
--- 998,1002 ----
AC_SUBST(LIBC)
AC_MSG_CHECKING(for --with-libc=STRING)
! AC_ARG_WITH(libc, [ --with-libc=STRING C library], [
if test "$withval" = no
then LIBC=
***************
*** 1083,1087 ****
AC_MSG_CHECKING(for --with-wctype-functions)
AC_ARG_WITH(wctype-functions,
! [--with-wctype-functions use wctype.h functions], [
if test "$withval" != no
then AC_DEFINE(WANT_WCTYPE_FUNCTIONS) AC_MSG_RESULT(yes)
--- 1093,1097 ----
AC_MSG_CHECKING(for --with-wctype-functions)
AC_ARG_WITH(wctype-functions,
! [ --with-wctype-functions use wctype.h functions], [
if test "$withval" != no
then AC_DEFINE(WANT_WCTYPE_FUNCTIONS) AC_MSG_RESULT(yes)