From d632050d1d5dcf9517f5caa930e30d212b68009b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 12 Aug 2004 13:45:08 +0000 Subject: Define _BSD_TYPES. Fixes #1005308. Backported to 2.3. --- configure | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- configure.in | 4 ++++ pyconfig.h.in | 9 +++++--- 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 30aeb3f..d6544a9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.462 . +# 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. # @@ -1347,6 +1347,14 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +# 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 # Arguments passed to configure. @@ -12351,8 +12359,9 @@ echo "${ECHO_T}MACHDEP_OBJS" >&6 -for ac_func in alarm chown clock confstr ctermid execv \ - fork fpathconf ftime ftruncate \ + +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 \ kill killpg lchown lstat mkfifo mknod mktime \ @@ -15592,6 +15601,57 @@ rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $works" >&5 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 +#include + +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 echo $ECHO_N "checking if sockaddr has sa_len member... $ECHO_C" >&6 diff --git a/configure.in b/configure.in index fbd436b..6f99ae9 100644 --- a/configure.in +++ b/configure.in @@ -50,6 +50,10 @@ AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features] # them. 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 # Arguments passed to configure. diff --git a/pyconfig.h.in b/pyconfig.h.in index 19227e0..7c45736 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -428,15 +428,15 @@ /* Define to 1 if you have the `snprintf' function. */ #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 /* struct sockaddr_storage (sys/socket.h) */ #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 @@ -806,6 +806,9 @@ # undef _ALL_SOURCE #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 -- cgit v0.12