[Python-checkins] python/dist/src configure, 1.451, 1.452 configure.in, 1.464, 1.465 pyconfig.h.in, 1.102, 1.103

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17447

Modified Files:
	configure configure.in pyconfig.h.in 
Log Message:
Define _BSD_TYPES. Fixes #1005308. Backported to 2.3.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.451
retrieving revision 1.452
diff -C2 -d -r1.451 -r1.452
*** configure	16 Jul 2004 08:43:47 -0000	1.451
--- configure	12 Aug 2004 13:45:08 -0000	1.452
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.462 .
  # 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.464 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.57 for python 2.4.
***************
*** 1348,1351 ****
--- 1348,1359 ----
  
  
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _BSD_TYPES 1
+ _ACEOF
+ 
+ 
  define_xopen_source=yes
  
***************
*** 12352,12357 ****
  
  
! for ac_func in alarm chown clock confstr ctermid execv \
!  fork fpathconf ftime ftruncate \
   gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
   getpriority getpwent getsid getwd \
--- 12360,12366 ----
  
  
! 
! for ac_func in alarm bind_textdomain_codeset chown clock confstr ctermid \
!  execv fork fpathconf ftime ftruncate \
   gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
   getpriority getpwent getsid getwd \
***************
*** 15593,15596 ****
--- 15602,15656 ----
  echo "${ECHO_T}$works" >&6
  
+ # check for socketpair
+ echo "$as_me:$LINENO: checking for socketpair" >&5
+ echo $ECHO_N "checking for socketpair... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
+ int
+ main ()
+ {
+ void *x=socketpair
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SOCKETPAIR 1
+ _ACEOF
+ 
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
  # check if sockaddr has sa_len member
  echo "$as_me:$LINENO: checking if sockaddr has sa_len member" >&5

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.464
retrieving revision 1.465
diff -C2 -d -r1.464 -r1.465
*** configure.in	9 Aug 2004 04:51:39 -0000	1.464
--- configure.in	12 Aug 2004 13:45:08 -0000	1.465
***************
*** 51,54 ****
--- 51,58 ----
  AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
  
+ # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+ # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+ AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
+ 
  define_xopen_source=yes
  

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** pyconfig.h.in	9 Aug 2004 04:51:40 -0000	1.102
--- pyconfig.h.in	12 Aug 2004 13:45:08 -0000	1.103
***************
*** 429,435 ****
  #undef HAVE_SNPRINTF
  
- /* Define to 1 if you have the `socketpair' function. */
- #undef HAVE_SOCKETPAIR
- 
  /* Define if sockaddr has sa_len member */
  #undef HAVE_SOCKADDR_SA_LEN
--- 429,432 ----
***************
*** 438,441 ****
--- 435,441 ----
  #undef HAVE_SOCKADDR_STORAGE
  
+ /* Define if you have the 'socketpair' function. */
+ #undef HAVE_SOCKETPAIR
+ 
  /* Define to 1 if you have the `statvfs' function. */
  #undef HAVE_STATVFS
***************
*** 807,810 ****
--- 807,813 ----
  #endif
  
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
  /* This must be set to 64 on some systems to enable large file support. */
  #undef _FILE_OFFSET_BITS