mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-06 21:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Patch #805604: Do not check for sem_init, do not use -Kthread,

Browse source 
if configured --without-threads. Backported to 2.3.
This commit is contained in:
Martin v. Löwis 2003-09-20 10:47:47 +00:00
parent 1836781fae
commit 519adae1c1
2 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.431 . # From configure.in Revision: 1.432 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4. # Generated by GNU Autoconf 2.57 for python 2.4.
# #
@ -4458,13 +4458,11 @@ then
ac_cv_cxx_thread=yes ac_cv_cxx_thread=yes
else else
ac_cv_cxx_thread=no ac_cv_cxx_thread=no
CXX="$ac_save_cxx"
fi fi
rm -fr conftest* rm -fr conftest*
else
CXX="$ac_save_cxx"
fi fi
fi fi
CXX="$ac_save_cxx"
echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5 echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5
echo "${ECHO_T}$ac_cv_cxx_thread" >&6 echo "${ECHO_T}$ac_cv_cxx_thread" >&6
@ -10374,7 +10372,10 @@ _ACEOF
fi fi
# Dynamic linking for HP-UX # Dynamic linking for HP-UX
echo "$as_me:$LINENO: checking for library containing sem_init" >&5
# only check for sem_ini if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
echo "$as_me:$LINENO: checking for library containing sem_init" >&5
echo $ECHO_N "checking for library containing sem_init... $ECHO_C" >&6 echo $ECHO_N "checking for library containing sem_init... $ECHO_C" >&6
if test "${ac_cv_search_sem_init+set}" = set; then if test "${ac_cv_search_sem_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -10482,6 +10483,8 @@ fi
# 'Real Time' functions on Solaris # 'Real Time' functions on Solaris
# posix4 on Solaris 2.6 # posix4 on Solaris 2.6
# pthread (first!) on Linux # pthread (first!) on Linux
fi
# check if we need libintl for locale functions # check if we need libintl for locale functions
echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5 echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6 echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6
@ -10900,6 +10903,9 @@ _ACEOF
elif test "$ac_cv_kpthread" = "yes" elif test "$ac_cv_kpthread" = "yes"
then then
CC="$CC -Kpthread" CC="$CC -Kpthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -Kpthread"
fi
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define WITH_THREAD 1 #define WITH_THREAD 1
_ACEOF _ACEOF
@ -10909,6 +10915,9 @@ _ACEOF
elif test "$ac_cv_kthread" = "yes" elif test "$ac_cv_kthread" = "yes"
then then
CC="$CC -Kthread" CC="$CC -Kthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -Kthread"
fi
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define WITH_THREAD 1 #define WITH_THREAD 1
_ACEOF _ACEOF
@ -10918,6 +10927,9 @@ _ACEOF
elif test "$ac_cv_pthread" = "yes" elif test "$ac_cv_pthread" = "yes"
then then
CC="$CC -pthread" CC="$CC -pthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -pthread"
fi
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define WITH_THREAD 1 #define WITH_THREAD 1
_ACEOF _ACEOF

20
configure.in
View file

@ -897,13 +897,11 @@ then
ac_cv_cxx_thread=yes ac_cv_cxx_thread=yes
else else
ac_cv_cxx_thread=no ac_cv_cxx_thread=no
CXX="$ac_save_cxx"
fi fi
rm -fr conftest* rm -fr conftest*
else
CXX="$ac_save_cxx"
fi fi
fi fi
CXX="$ac_save_cxx"
AC_MSG_RESULT($ac_cv_cxx_thread) AC_MSG_RESULT($ac_cv_cxx_thread)
dnl # check for ANSI or K&R ("traditional") preprocessor dnl # check for ANSI or K&R ("traditional") preprocessor
@ -1422,9 +1420,14 @@ AC_MSG_RESULT($SHLIBS)
# checks for libraries # checks for libraries
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
# only check for sem_ini if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
# posix4 on Solaris 2.6 # posix4 on Solaris 2.6
# pthread (first!) on Linux # pthread (first!) on Linux
fi
# check if we need libintl for locale functions # check if we need libintl for locale functions
AC_CHECK_LIB(intl, textdomain, AC_CHECK_LIB(intl, textdomain,
AC_DEFINE(WITH_LIBINTL, 1, AC_DEFINE(WITH_LIBINTL, 1,
@ -1542,18 +1545,27 @@ then
elif test "$ac_cv_kpthread" = "yes" elif test "$ac_cv_kpthread" = "yes"
then then
CC="$CC -Kpthread" CC="$CC -Kpthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -Kpthread"
fi
AC_DEFINE(WITH_THREAD) AC_DEFINE(WITH_THREAD)
posix_threads=yes posix_threads=yes
THREADOBJ="Python/thread.o" THREADOBJ="Python/thread.o"
elif test "$ac_cv_kthread" = "yes" elif test "$ac_cv_kthread" = "yes"
then then
CC="$CC -Kthread" CC="$CC -Kthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -Kthread"
fi
AC_DEFINE(WITH_THREAD) AC_DEFINE(WITH_THREAD)
posix_threads=yes posix_threads=yes
THREADOBJ="Python/thread.o" THREADOBJ="Python/thread.o"
elif test "$ac_cv_pthread" = "yes" elif test "$ac_cv_pthread" = "yes"
then then
CC="$CC -pthread" CC="$CC -pthread"
if test "$ac_cv_cxx_thread" = "yes"; then
CXX="$CXX -pthread"
fi
AC_DEFINE(WITH_THREAD) AC_DEFINE(WITH_THREAD)
posix_threads=yes posix_threads=yes
THREADOBJ="Python/thread.o" THREADOBJ="Python/thread.o"