[Python-checkins] python/dist/src configure, 1.421, 1.422 configure.in, 1.432, 1.433

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17737

Modified Files:
	configure configure.in 
Log Message:
Patch #805604: Do not check for sem_init, do not use -Kthread,
if configured --without-threads. Backported to 2.3.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.421
retrieving revision 1.422
diff -C2 -d -r1.421 -r1.422
*** configure	19 Sep 2003 00:59:14 -0000	1.421
--- configure	20 Sep 2003 10:47:47 -0000	1.422
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.431 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.57 for python 2.4.
--- 1,4 ----
  #! /bin/sh
! # 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.
***************
*** 4459,4469 ****
    else
      ac_cv_cxx_thread=no
-     CXX="$ac_save_cxx"
    fi
    rm -fr conftest*
- else
-  CXX="$ac_save_cxx"
  fi
  fi
  echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5
  echo "${ECHO_T}$ac_cv_cxx_thread" >&6
--- 4459,4467 ----
    else
      ac_cv_cxx_thread=no
    fi
    rm -fr conftest*
  fi
  fi
+ CXX="$ac_save_cxx"
  echo "$as_me:$LINENO: result: $ac_cv_cxx_thread" >&5
  echo "${ECHO_T}$ac_cv_cxx_thread" >&6
***************
*** 10375,10379 ****
  fi
  	# Dynamic linking for HP-UX
! 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
--- 10373,10380 ----
  fi
  	# Dynamic linking for HP-UX
! 
! # 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
***************
*** 10481,10486 ****
  fi
   # 'Real Time' functions on Solaris
! 					    # posix4 on Solaris 2.6
! 					    # pthread (first!) on Linux
  # check if we need libintl for locale functions
  echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
--- 10482,10489 ----
  fi
   # 'Real Time' functions on Solaris
! 						# 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
***************
*** 10901,10904 ****
--- 10904,10910 ----
  then
      CC="$CC -Kpthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -Kpthread"
+     fi
      cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
***************
*** 10910,10913 ****
--- 10916,10922 ----
  then
      CC="$CC -Kthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -Kthread"
+     fi
      cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
***************
*** 10919,10922 ****
--- 10928,10934 ----
  then
      CC="$CC -pthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -pthread"
+     fi
      cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.432
retrieving revision 1.433
diff -C2 -d -r1.432 -r1.433
*** configure.in	19 Sep 2003 00:59:16 -0000	1.432
--- configure.in	20 Sep 2003 10:47:47 -0000	1.433
***************
*** 876,880 ****
  if test "$ac_cv_kpthread" = "yes"
  then
!   CXX="$CXX -Kpthread"
    ac_cv_cxx_thread=yes
  elif test "$ac_cv_kthread" = "yes"
--- 876,880 ----
  if test "$ac_cv_kpthread" = "yes"
  then
!   CXX="$CXX -Kpthread"  
    ac_cv_cxx_thread=yes
  elif test "$ac_cv_kthread" = "yes"
***************
*** 898,908 ****
    else
      ac_cv_cxx_thread=no
-     CXX="$ac_save_cxx"
    fi
    rm -fr conftest*
- else
-  CXX="$ac_save_cxx"
  fi
  fi
  AC_MSG_RESULT($ac_cv_cxx_thread)
  
--- 898,906 ----
    else
      ac_cv_cxx_thread=no
    fi
    rm -fr conftest*
  fi
  fi
+ CXX="$ac_save_cxx"
  AC_MSG_RESULT($ac_cv_cxx_thread)
  
***************
*** 1423,1429 ****
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
  AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
! AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
! 					    # posix4 on Solaris 2.6
! 					    # pthread (first!) on Linux
  # check if we need libintl for locale functions
  AC_CHECK_LIB(intl, textdomain,
--- 1421,1432 ----
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
  AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
! 
! # 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
! 						# pthread (first!) on Linux
! fi
! 
  # check if we need libintl for locale functions
  AC_CHECK_LIB(intl, textdomain,
***************
*** 1543,1546 ****
--- 1546,1552 ----
  then
      CC="$CC -Kpthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -Kpthread"
+     fi
      AC_DEFINE(WITH_THREAD)
      posix_threads=yes
***************
*** 1549,1552 ****
--- 1555,1561 ----
  then
      CC="$CC -Kthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -Kthread"
+     fi
      AC_DEFINE(WITH_THREAD)
      posix_threads=yes
***************
*** 1555,1558 ****
--- 1564,1570 ----
  then
      CC="$CC -pthread"
+     if test "$ac_cv_cxx_thread" = "yes"; then
+         CXX="$CXX -pthread"
+     fi
      AC_DEFINE(WITH_THREAD)
      posix_threads=yes