diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-09-20 10:47:47 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-09-20 10:47:47 (GMT) |
| commit | 519adae1c10ac8d15e79668f696d4bfaf81cbf8c (patch) | |
| tree | b2bf49446b25489e15d2b8b321a3263dc6817bf7 /configure | |
| parent | 1836781faee7628f9ebb2427470f3b34042dd4f8 (diff) | |
| download | cpython-519adae1c10ac8d15e79668f696d4bfaf81cbf8c.zip cpython-519adae1c10ac8d15e79668f696d4bfaf81cbf8c.tar.gz cpython-519adae1c10ac8d15e79668f696d4bfaf81cbf8c.tar.bz2 | |
Patch #805604: Do not check for sem_init, do not use -Kthread,
if configured --without-threads. Backported to 2.3.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.431 . +# From configure.in Revision: 1.432 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. # @@ -4458,13 +4458,11 @@ then ac_cv_cxx_thread=yes else ac_cv_cxx_thread=no - CXX="$ac_save_cxx" fi rm -fr conftest* -else - CXX="$ac_save_cxx" fi fi +CXX="$ac_save_cxx" echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5 echo "${ECHO_T}$ac_cv_cxx_thread" >&6 @@ -10374,7 +10372,10 @@ _ACEOF fi # 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 if test "${ac_cv_search_sem_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10480,8 +10481,10 @@ if test "$ac_cv_search_sem_init" != no; then fi # 'Real Time' functions on Solaris - # posix4 on Solaris 2.6 - # pthread (first!) on Linux + # posix4 on Solaris 2.6 + # pthread (first!) on Linux +fi + # check if we need libintl for locale functions echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5 echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6 @@ -10900,6 +10903,9 @@ _ACEOF elif test "$ac_cv_kpthread" = "yes" then CC="$CC -Kpthread" + if test "$ac_cv_cxx_thread" = "yes"; then + CXX="$CXX -Kpthread" + fi cat >>confdefs.h <<\_ACEOF #define WITH_THREAD 1 _ACEOF @@ -10909,6 +10915,9 @@ _ACEOF elif test "$ac_cv_kthread" = "yes" then CC="$CC -Kthread" + if test "$ac_cv_cxx_thread" = "yes"; then + CXX="$CXX -Kthread" + fi cat >>confdefs.h <<\_ACEOF #define WITH_THREAD 1 _ACEOF @@ -10918,6 +10927,9 @@ _ACEOF elif test "$ac_cv_pthread" = "yes" then CC="$CC -pthread" + if test "$ac_cv_cxx_thread" = "yes"; then + CXX="$CXX -pthread" + fi cat >>confdefs.h <<\_ACEOF #define WITH_THREAD 1 _ACEOF |