[Python-checkins] python/dist/src configure, 1.441, 1.442 configure.in, 1.452, 1.453 pyconfig.h.in, 1.95, 1.96

mondragon at users.sourceforge.net mondragon at users.sourceforge.net
Sun Mar 21 18:45:44 EST 2004


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

Modified Files:
	configure configure.in pyconfig.h.in 
Log Message:
Added configure check for broken poll() on some unix systems (MacOS X 10.3)
Fixes SF Bug #850981


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.441
retrieving revision 1.442
diff -C2 -d -r1.441 -r1.442
*** configure	10 Feb 2004 16:50:15 -0000	1.441
--- configure	21 Mar 2004 23:45:39 -0000	1.442
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.451 .
  # 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.452 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.57 for python 2.4.
***************
*** 17578,17581 ****
--- 17578,17653 ----
  fi
  
+ echo "$as_me:$LINENO: checking for broken poll()" >&5
+ echo $ECHO_N "checking for broken poll()... $ECHO_C" >&6
+ if test "$cross_compiling" = yes; then
+   ac_cv_broken_poll=no
+ else
+   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 <poll.h>
+ 
+ int main (void)
+     {
+     struct pollfd poll_struct = { 42, POLLIN|POLLPRI|POLLOUT, 0 };
+ 
+     close (42);
+ 
+     int poll_test = poll (&poll_struct, 1, 0);
+ 
+     if (poll_test < 0)
+         {
+         exit(0);
+         }
+     else if (poll_test == 0 && poll_struct.revents != POLLNVAL)
+         {
+         exit(0);
+         }
+     else
+         {
+         exit(1);
+         }
+     }
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (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
+   ac_cv_broken_poll=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_broken_poll=no
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_broken_poll" >&5
+ echo "${ECHO_T}$ac_cv_broken_poll" >&6
+ if test "$ac_cv_broken_poll" = yes
+ then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_BROKEN_POLL 1
+ _ACEOF
+ 
+ fi
+ 
+ 
  # tzset(3) exists and works like we expect it to
  echo "$as_me:$LINENO: checking for working tzset()" >&5

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.452
retrieving revision 1.453
diff -C2 -d -r1.452 -r1.453
*** configure.in	10 Feb 2004 16:50:18 -0000	1.452
--- configure.in	21 Mar 2004 23:45:41 -0000	1.453
***************
*** 2766,2769 ****
--- 2766,2806 ----
  fi
  
+ AC_MSG_CHECKING(for broken poll())
+ AC_TRY_RUN([
+ #include <poll.h>
+ 
+ int main (void)
+     {
+     struct pollfd poll_struct = { 42, POLLIN|POLLPRI|POLLOUT, 0 };
+     
+     close (42);
+ 
+     int poll_test = poll (&poll_struct, 1, 0);
+ 
+     if (poll_test < 0)
+         {
+         exit(0);
+         }
+     else if (poll_test == 0 && poll_struct.revents != POLLNVAL)
+         {
+         exit(0);
+         }
+     else
+         {
+         exit(1);
+         }
+     }
+ ],
+ ac_cv_broken_poll=yes,
+ ac_cv_broken_poll=no,
+ ac_cv_broken_poll=no)
+ AC_MSG_RESULT($ac_cv_broken_poll)
+ if test "$ac_cv_broken_poll" = yes
+ then
+   AC_DEFINE(HAVE_BROKEN_POLL, 1,
+       [Define if poll() sets errno on invalid file descriptors.])
+ fi
+ 
+ 
  # tzset(3) exists and works like we expect it to
  AC_MSG_CHECKING(for working tzset())

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** pyconfig.h.in	10 Feb 2004 16:50:18 -0000	1.95
--- pyconfig.h.in	21 Mar 2004 23:45:42 -0000	1.96
***************
*** 47,50 ****
--- 47,53 ----
  #undef HAVE_BROKEN_NICE
  
+ /* Define if poll() sets errno on invalid file descriptors. */
+ #undef HAVE_BROKEN_POLL
+ 
  /* Define if the Posix semaphores do not work on your system */
  #undef HAVE_BROKEN_POSIX_SEMAPHORES
***************
*** 436,439 ****
--- 439,448 ----
  #undef HAVE_STDINT_H
  
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+ 
+ /* Define to 1 if you have the `strdup' function. */
+ #undef HAVE_STRDUP
+ 
  /* Define to 1 if you have the `strerror' function. */
  #undef HAVE_STRERROR
***************
*** 445,448 ****
--- 454,460 ----
  #undef HAVE_STRINGS_H
  
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+ 
  /* Define to 1 if you have the <stropts.h> header file. */
  #undef HAVE_STROPTS_H




More information about the Python-checkins mailing list