Get test_ioctl to pass on HPUX 11.

TIOCGPGRP and many other definitions come from bsdtty.h, so it needs
to be included at least on HPUX.

diff --git a/Modules/termios.c b/Modules/termios.c
index 3ace25c4e1bffbe327879dc2d731f8f2f5047654..7e4eb7ba8d0dc810753b01d6c40e3fdd5a40de9a 100644 (file)
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -19,6 +19,10 @@
 #ifdef HAVE_SYS_MODEM_H
 #include <sys/modem.h>
 #endif
+/* HP-UX requires that this be included to pick up TIOCGPGRP and friends */
+#ifdef HAVE_SYS_BSDTTY_H
+#include <sys/bsdtty.h>
+#endif
 
 PyDoc_STRVAR(termios__doc__,
 "This module provides an interface to the Posix calls for tty I/O control.\n\

diff --git a/configure b/configure
index 165b742af9bc66e39753870eac7a9bf9b972f301..c5b4a5ceaaa9220d7333cf0514fe193ca9f86a16 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.408 .
+# From configure.in Revision: 1.409 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
 #
@@ -908,7 +908,7 @@ esac
 # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
@@ -4126,13 +4126,14 @@ fi
 
 
 
+
 
 
 for ac_header in dlfcn.h fcntl.h grp.h limits.h langinfo.h \
 libintl.h locale.h ncurses.h poll.h pthread.h \
 signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
 unistd.h utime.h \
-sys/audioio.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
+sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h term.h libutil.h \
 sys/resource.h netpacket/packet.h sysexits.h
@@ -18201,7 +18202,7 @@ esac
 # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
 ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 

diff --git a/configure.in b/configure.in
index 3f164571c5c6f9266fee4ea6cc32524ae7fb4c46..bf994af1059b1f2bb2570261c36bb67c2e93d1cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -806,7 +806,7 @@ AC_CHECK_HEADERS(dlfcn.h fcntl.h grp.h limits.h langinfo.h \
 libintl.h locale.h ncurses.h poll.h pthread.h \
 signal.h stdarg.h stddef.h stdlib.h stropts.h termios.h thread.h \
 unistd.h utime.h \
-sys/audioio.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
+sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
 sys/un.h sys/utsname.h sys/wait.h pty.h term.h libutil.h \
 sys/resource.h netpacket/packet.h sysexits.h)

diff --git a/pyconfig.h.in b/pyconfig.h.in
index a5adca1d766ecd3e89a1f9c8d6bb8c7cdc2b505d..2f14b8431602cc6823f59c66d1b1d10c1db6bbab 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -494,6 +494,9 @@
 /* Define to 1 if you have the <sys/audioio.h> header file. */
 #undef HAVE_SYS_AUDIOIO_H
 
+/* Define to 1 if you have the <sys/bsdtty.h> header file. */
+#undef HAVE_SYS_BSDTTY_H
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H