summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2003-05-23 14:35:24 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2003-05-23 14:35:24 (GMT)
commit8225103d2d381991703970dc601ef83a12da7fc5 (patch)
treeb8be6772f9e64dd8ebe88b4f6a783a9544829c4f
parent661a9e3e5b79e03f912038bd56d8638f9ba5a804 (diff)
downloadcpython-8225103d2d381991703970dc601ef83a12da7fc5.zip
cpython-8225103d2d381991703970dc601ef83a12da7fc5.tar.gz
cpython-8225103d2d381991703970dc601ef83a12da7fc5.tar.bz2
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.
-rw-r--r--Modules/termios.c4
-rwxr-xr-xconfigure9
-rw-r--r--configure.in2
-rw-r--r--pyconfig.h.in3
4 files changed, 13 insertions, 5 deletions
diff --git a/Modules/termios.c b/Modules/termios.c
index 3ace25c..7e4eb7b 100644
--- 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 165b742..c5b4a5c 100755
--- 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`
@@ -4128,11 +4128,12 @@ 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 3f16457..bf994af 100644
--- 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 a5adca1..2f14b84 100644
--- 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