[Python-checkins] CVS: python/dist/src acconfig.h,1.37,1.38 config.h.in,2.74,2.75 configure.in,1.158,1.159 configure,1.148,1.149

Mon, 18 Sep 2000 17:46:48 -0700

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9822

Modified Files:
	acconfig.h config.h.in configure.in configure 
Log Message:
Make better use of GNU Pth -- patch by Andy Dustman.
I can't test this, so I'm just checking it in with blind faith in Andy.
I've tested that it doesn't broeak a non-Pth build on Linux.

Changes include:

- There's a --with-pth configure option.

- Instead of _GNU_PTH, we test for HAVE_PTH.

- Better signal handling.

- (The config.h.in file is regenerated in a slightly different order.)

Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** acconfig.h	2000/08/31 16:11:07	1.37
--- acconfig.h	2000/09/19 00:46:45	1.38
***************
*** 36,42 ****
  #undef GETTIMEOFDAY_NO_TZ

- /* Define if you have GNU PTH threads */
- #undef _GNU_PTH
- 
  /* Define this if your time.h defines altzone */
  #undef HAVE_ALTZONE
--- 36,39 ----
***************
*** 65,68 ****
--- 62,68 ----
  /* Define if your compiler supports function prototypes */
  #undef HAVE_PROTOTYPES
+ 
+ /* Define if you have GNU PTH threads */
+ #undef HAVE_PTH

  /* Define if your compiler supports variable length function prototypes

Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.74
retrieving revision 2.75
diff -C2 -r2.74 -r2.75
*** config.h.in	2000/09/15 03:38:12	2.74
--- config.h.in	2000/09/19 00:46:45	2.75
***************
*** 104,110 ****
  #undef GETTIMEOFDAY_NO_TZ

- /* Define if you have GNU PTH threads */
- #undef _GNU_PTH
- 
  /* Define this if your time.h defines altzone */
  #undef HAVE_ALTZONE
--- 104,107 ----
***************
*** 131,134 ****
--- 128,134 ----
  #undef HAVE_PROTOTYPES

+ /* Define if you have GNU PTH threads */
+ #undef HAVE_PTH
+ 
  /* Define if your compiler supports variable length function prototypes
     (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
***************
*** 273,276 ****
--- 273,279 ----
  #undef SIZEOF_VOID_P

+ /* Define if you have the _getpty function.  */
+ #undef HAVE__GETPTY
+ 
  /* Define if you have the alarm function.  */
  #undef HAVE_ALARM
***************
*** 360,366 ****
  #undef HAVE_GETPID

- /* Define if you have the _getpty function.  */
- #undef HAVE__GETPTY
- 
  /* Define if you have the getpwent function.  */
  #undef HAVE_GETPWENT
--- 363,366 ----
***************
*** 522,533 ****
  #undef HAVE_WAITPID

! /* Define if you have the <db_185.h> header file.  */
! #undef HAVE_DB_185_H

  /* Define if you have the <db1/ndbm.h> header file.  */
  #undef HAVE_DB1_NDBM_H

! /* Define if you have the <db.h> header file.  */
! #undef HAVE_DB_H

  /* Define if you have the <dirent.h> header file.  */
--- 522,533 ----
  #undef HAVE_WAITPID

! /* Define if you have the <db.h> header file.  */
! #undef HAVE_DB_H

  /* Define if you have the <db1/ndbm.h> header file.  */
  #undef HAVE_DB1_NDBM_H

! /* Define if you have the <db_185.h> header file.  */
! #undef HAVE_DB_185_H

  /* Define if you have the <dirent.h> header file.  */

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -r1.158 -r1.159
*** configure.in	2000/09/15 03:38:12	1.158
--- configure.in	2000/09/19 00:46:45	1.159
***************
*** 746,749 ****
--- 746,758 ----
      AC_DEFINE(C_THREADS)
      LIBOBJS="$LIBOBJS thread.o"],[
+     AC_MSG_CHECKING(for --with-pth)
+     AC_ARG_WITH(pth,
+     [  --with-pth                      use GNU pth threading libraries], [
+     AC_MSG_RESULT($withval)
+     AC_DEFINE(WITH_THREAD)
+     AC_DEFINE(HAVE_PTH)
+     LIBS="-lpth $LIBS"
+     LIBOBJS="$LIBOBJS thread.o"],[
+     AC_MSG_RESULT(no)
      AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
      AC_DEFINE(_POSIX_THREADS)
***************
*** 768,775 ****
      LIBS="$LIBS -lthread"
      LIBOBJS="$LIBOBJS thread.o"], [
-     AC_CHECK_LIB(pth, pth_init, [AC_DEFINE(WITH_THREAD)
-     AC_DEFINE(_GNU_PTH)
-     LIBS="-lpth $LIBS"
-     LIBOBJS="$LIBOBJS thread.o"],[
      AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
      AC_DEFINE(_POSIX_THREADS)
--- 777,780 ----

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -r1.148 -r1.149
*** configure	2000/09/15 03:38:12	1.148
--- configure	2000/09/19 00:46:45	1.149
***************
*** 1,8 ****
  #! /bin/sh

! # From configure.in Revision: 1.157 

  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.14.1 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
--- 1,8 ----
  #! /bin/sh
[...4721 lines suppressed...]
!     echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
--- 6023,6027 ----
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
***************
*** 6378,6381 ****
  chmod +x $CONFIG_STATUS
  rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1

--- 6326,6329 ----
  chmod +x $CONFIG_STATUS
  rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1