Eliminate use of LIBOBJS which is an error in autoconf 2.53.
This commit is contained in:
parent
4179a01bb7
commit
2d7e264762
@ -148,7 +148,7 @@ LIBC= @LIBC@
|
|||||||
SYSLIBS= $(LIBM) $(LIBC)
|
SYSLIBS= $(LIBM) $(LIBC)
|
||||||
|
|
||||||
MAINOBJ= @MAINOBJ@
|
MAINOBJ= @MAINOBJ@
|
||||||
LIBOBJS= @LIBOBJS@
|
THREADOBJ= @THREADOBJ@
|
||||||
DLINCLDIR= @DLINCLDIR@
|
DLINCLDIR= @DLINCLDIR@
|
||||||
DYNLOADFILE= @DYNLOADFILE@
|
DYNLOADFILE= @DYNLOADFILE@
|
||||||
MACHDEP_OBJS= @MACHDEP_OBJS@
|
MACHDEP_OBJS= @MACHDEP_OBJS@
|
||||||
@ -242,7 +242,7 @@ PYTHON_OBJS= \
|
|||||||
Python/getopt.o \
|
Python/getopt.o \
|
||||||
Python/$(DYNLOADFILE) \
|
Python/$(DYNLOADFILE) \
|
||||||
$(MACHDEP_OBJS) \
|
$(MACHDEP_OBJS) \
|
||||||
$(LIBOBJS)
|
$(THREADOBJ)
|
||||||
|
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
38
configure.in
38
configure.in
@ -1050,6 +1050,7 @@ then with_threads="yes"
|
|||||||
fi
|
fi
|
||||||
AC_MSG_RESULT($with_threads)
|
AC_MSG_RESULT($with_threads)
|
||||||
|
|
||||||
|
AC_SUBST(THREADOBJ)
|
||||||
if test "$with_threads" = "no"
|
if test "$with_threads" = "no"
|
||||||
then
|
then
|
||||||
USE_THREAD_MODULE="#"
|
USE_THREAD_MODULE="#"
|
||||||
@ -1059,13 +1060,13 @@ then
|
|||||||
# Defining _REENTRANT on system with POSIX threads should not hurt.
|
# Defining _REENTRANT on system with POSIX threads should not hurt.
|
||||||
AC_DEFINE(_REENTRANT)
|
AC_DEFINE(_REENTRANT)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBOBJS="$LIBOBJS thread.o"
|
THREADOBJ="Python/thread.o"
|
||||||
elif test "$ac_cv_kpthread" = "yes"
|
elif test "$ac_cv_kpthread" = "yes"
|
||||||
then
|
then
|
||||||
CC="$CC -Kpthread"
|
CC="$CC -Kpthread"
|
||||||
AC_DEFINE(WITH_THREAD)
|
AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBOBJS="$LIBOBJS thread.o"
|
THREADOBJ="Python/thread.o"
|
||||||
else
|
else
|
||||||
if test ! -z "$with_threads" -a -d "$with_threads"
|
if test ! -z "$with_threads" -a -d "$with_threads"
|
||||||
then LDFLAGS="$LDFLAGS -L$with_threads"
|
then LDFLAGS="$LDFLAGS -L$with_threads"
|
||||||
@ -1090,11 +1091,11 @@ else
|
|||||||
AC_DEFINE(C_THREADS)
|
AC_DEFINE(C_THREADS)
|
||||||
AC_DEFINE(HURD_C_THREADS)
|
AC_DEFINE(HURD_C_THREADS)
|
||||||
LIBS="$LIBS -lthreads"
|
LIBS="$LIBS -lthreads"
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
|
||||||
AC_DEFINE(C_THREADS)
|
AC_DEFINE(C_THREADS)
|
||||||
AC_DEFINE(MACH_C_THREADS)
|
AC_DEFINE(MACH_C_THREADS)
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
AC_MSG_CHECKING(for --with-pth)
|
AC_MSG_CHECKING(for --with-pth)
|
||||||
AC_ARG_WITH(pth,
|
AC_ARG_WITH(pth,
|
||||||
[ --with-pth use GNU pth threading libraries], [
|
[ --with-pth use GNU pth threading libraries], [
|
||||||
@ -1102,7 +1103,7 @@ else
|
|||||||
AC_DEFINE(WITH_THREAD)
|
AC_DEFINE(WITH_THREAD)
|
||||||
AC_DEFINE(HAVE_PTH)
|
AC_DEFINE(HAVE_PTH)
|
||||||
LIBS="-lpth $LIBS"
|
LIBS="-lpth $LIBS"
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
|
||||||
# Just looking for pthread_create in libpthread is not enough:
|
# Just looking for pthread_create in libpthread is not enough:
|
||||||
@ -1118,34 +1119,34 @@ pthread_create (NULL, NULL, start_routine, NULL)], [
|
|||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(WITH_THREAD)
|
AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
LIBS=$_libs
|
LIBS=$_libs
|
||||||
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
|
||||||
AC_DEFINE(BEOS_THREADS)
|
AC_DEFINE(BEOS_THREADS)
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBS="$LIBS -lpthreads"
|
LIBS="$LIBS -lpthreads"
|
||||||
LIBOBJS="$LIBOBJS thread.o"], [
|
THREADOBJ="Python/thread.o"], [
|
||||||
AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBS="$LIBS -lc_r"
|
LIBS="$LIBS -lc_r"
|
||||||
LIBOBJS="$LIBOBJS thread.o"], [
|
THREADOBJ="Python/thread.o"], [
|
||||||
AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBS="$LIBS -lthread"
|
LIBS="$LIBS -lthread"
|
||||||
LIBOBJS="$LIBOBJS thread.o"], [
|
THREADOBJ="Python/thread.o"], [
|
||||||
AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBS="$LIBS -lpthread"
|
LIBS="$LIBS -lpthread"
|
||||||
LIBOBJS="$LIBOBJS thread.o"], [
|
THREADOBJ="Python/thread.o"], [
|
||||||
AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
|
||||||
posix_threads=yes
|
posix_threads=yes
|
||||||
LIBS="$LIBS -lcma"
|
LIBS="$LIBS -lcma"
|
||||||
LIBOBJS="$LIBOBJS thread.o"],[
|
THREADOBJ="Python/thread.o"],[
|
||||||
USE_THREAD_MODULE="#"])
|
USE_THREAD_MODULE="#"])
|
||||||
])])])])])])])])])])
|
])])])])])])])])])])
|
||||||
|
|
||||||
@ -1181,13 +1182,13 @@ pthread_create (NULL, NULL, start_routine, NULL)], [
|
|||||||
|
|
||||||
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
|
||||||
LIBS="$LIBS -lmpc"
|
LIBS="$LIBS -lmpc"
|
||||||
LIBOBJS="$LIBOBJS thread.o"
|
THREADOBJ="Python/thread.o"
|
||||||
USE_THREAD_MODULE=""])
|
USE_THREAD_MODULE=""])
|
||||||
|
|
||||||
if test $posix_threads != "yes"; then
|
if test $posix_threads != "yes"; then
|
||||||
AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
|
AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
|
||||||
LIBS="$LIBS -lthread"
|
LIBS="$LIBS -lthread"
|
||||||
LIBOBJS="$LIBOBJS thread.o"
|
THREADOBJ="Python/thread.o"
|
||||||
USE_THREAD_MODULE=""])
|
USE_THREAD_MODULE=""])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2086,13 +2087,6 @@ cat >> confdefs.h <<\EOF
|
|||||||
EOF
|
EOF
|
||||||
AC_CHECK_TYPE(socklen_t, int)
|
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)
|
#AC_MSG_CHECKING(for Modules/Setup)
|
||||||
#if test ! -f Modules/Setup ; then
|
#if test ! -f Modules/Setup ; then
|
||||||
# if test ! -d Modules ; then
|
# if test ! -d Modules ; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user