[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.79,1.80 configure,1.292,1.293 configure.in,1.302,1.303
Martin v. L?wis
loewis@users.sourceforge.net
2002年4月05日 08:50:56 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv20323
Modified Files:
Makefile.pre.in configure configure.in
Log Message:
Eliminate use of LIBOBJS which is an error in autoconf 2.53.
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** Makefile.pre.in 3 Apr 2002 22:41:49 -0000 1.79
--- Makefile.pre.in 5 Apr 2002 16:50:52 -0000 1.80
***************
*** 149,153 ****
MAINOBJ= @MAINOBJ@
! LIBOBJS= @LIBOBJS@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
--- 149,153 ----
MAINOBJ= @MAINOBJ@
! THREADOBJ= @THREADOBJ@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
***************
*** 243,247 ****
Python/$(DYNLOADFILE) \
$(MACHDEP_OBJS) \
! $(LIBOBJS)
--- 243,247 ----
Python/$(DYNLOADFILE) \
$(MACHDEP_OBJS) \
! $(THREADOBJ)
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.292
retrieving revision 1.293
diff -C2 -d -r1.292 -r1.293
*** configure 29 Mar 2002 16:28:30 -0000 1.292
--- configure 5 Apr 2002 16:50:53 -0000 1.293
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.301
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.302
[...3120 lines suppressed...]
*** 7707,7711 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7710: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 7701,7705 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7704: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
***************
*** 7890,7893 ****
--- 7884,7888 ----
s%@USE_THREAD_MODULE@%$USE_THREAD_MODULE%g
s%@LDLAST@%$LDLAST%g
+ s%@THREADOBJ@%$THREADOBJ%g
s%@DLINCLDIR@%$DLINCLDIR%g
s%@DYNLOADFILE@%$DYNLOADFILE%g
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.302
retrieving revision 1.303
diff -C2 -d -r1.302 -r1.303
*** configure.in 29 Mar 2002 16:28:31 -0000 1.302
--- configure.in 5 Apr 2002 16:50:53 -0000 1.303
***************
*** 1051,1054 ****
--- 1051,1055 ----
AC_MSG_RESULT($with_threads)
+ AC_SUBST(THREADOBJ)
if test "$with_threads" = "no"
then
***************
*** 1060,1064 ****
AC_DEFINE(_REENTRANT)
posix_threads=yes
! LIBOBJS="$LIBOBJS thread.o"
elif test "$ac_cv_kpthread" = "yes"
then
--- 1061,1065 ----
AC_DEFINE(_REENTRANT)
posix_threads=yes
! THREADOBJ="Python/thread.o"
elif test "$ac_cv_kpthread" = "yes"
then
***************
*** 1066,1070 ****
AC_DEFINE(WITH_THREAD)
posix_threads=yes
! LIBOBJS="$LIBOBJS thread.o"
else
if test ! -z "$with_threads" -a -d "$with_threads"
--- 1067,1071 ----
AC_DEFINE(WITH_THREAD)
posix_threads=yes
! THREADOBJ="Python/thread.o"
else
if test ! -z "$with_threads" -a -d "$with_threads"
***************
*** 1091,1099 ****
AC_DEFINE(HURD_C_THREADS)
LIBS="$LIBS -lthreads"
! LIBOBJS="$LIBOBJS thread.o"],[
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
AC_DEFINE(MACH_C_THREADS)
! LIBOBJS="$LIBOBJS thread.o"],[
AC_MSG_CHECKING(for --with-pth)
AC_ARG_WITH(pth,
--- 1092,1100 ----
AC_DEFINE(HURD_C_THREADS)
LIBS="$LIBS -lthreads"
! THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(C_THREADS)
AC_DEFINE(MACH_C_THREADS)
! THREADOBJ="Python/thread.o"],[
AC_MSG_CHECKING(for --with-pth)
AC_ARG_WITH(pth,
***************
*** 1103,1107 ****
AC_DEFINE(HAVE_PTH)
LIBS="-lpth $LIBS"
! LIBOBJS="$LIBOBJS thread.o"],[
AC_MSG_RESULT(no)
--- 1104,1108 ----
AC_DEFINE(HAVE_PTH)
LIBS="-lpth $LIBS"
! THREADOBJ="Python/thread.o"],[
AC_MSG_RESULT(no)
***************
*** 1119,1150 ****
AC_DEFINE(WITH_THREAD)
posix_threads=yes
! LIBOBJS="$LIBOBJS thread.o"],[
LIBS=$_libs
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
! 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)
posix_threads=yes
LIBS="$LIBS -lpthreads"
! LIBOBJS="$LIBOBJS thread.o"], [
AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lc_r"
! LIBOBJS="$LIBOBJS thread.o"], [
AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"], [
AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lpthread"
! LIBOBJS="$LIBOBJS thread.o"], [
AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lcma"
! LIBOBJS="$LIBOBJS thread.o"],[
USE_THREAD_MODULE="#"])
])])])])])])])])])])
--- 1120,1151 ----
AC_DEFINE(WITH_THREAD)
posix_threads=yes
! THREADOBJ="Python/thread.o"],[
LIBS=$_libs
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
! THREADOBJ="Python/thread.o"],[
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
AC_DEFINE(BEOS_THREADS)
! THREADOBJ="Python/thread.o"],[
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lpthreads"
! THREADOBJ="Python/thread.o"], [
AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lc_r"
! THREADOBJ="Python/thread.o"], [
AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lthread"
! THREADOBJ="Python/thread.o"], [
AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lpthread"
! THREADOBJ="Python/thread.o"], [
AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lcma"
! THREADOBJ="Python/thread.o"],[
USE_THREAD_MODULE="#"])
])])])])])])])])])])
***************
*** 1182,1186 ****
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
LIBS="$LIBS -lmpc"
! LIBOBJS="$LIBOBJS thread.o"
USE_THREAD_MODULE=""])
--- 1183,1187 ----
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
LIBS="$LIBS -lmpc"
! THREADOBJ="Python/thread.o"
USE_THREAD_MODULE=""])
***************
*** 1188,1192 ****
AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
LIBS="$LIBS -lthread"
! LIBOBJS="$LIBOBJS thread.o"
USE_THREAD_MODULE=""])
fi
--- 1189,1193 ----
AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
LIBS="$LIBS -lthread"
! THREADOBJ="Python/thread.o"
USE_THREAD_MODULE=""])
fi
***************
*** 2086,2096 ****
EOF
AC_CHECK_TYPE(socklen_t, int)
-
- # Add Python/ prefix to LIBOBJS
- libobjs=$LIBOBJS
- LIBOBJS=
- for obj in $libobjs; do
- LIBOBJS="$LIBOBJS Python/$obj"
- done
#AC_MSG_CHECKING(for Modules/Setup)
--- 2087,2090 ----