From: Bruno Haible Date: Wed, 27 Nov 2019 23:34:34 +0000 (+0100) Subject: openpty, forkpty: Fix build error on Solaris 11.4. X-Git-Tag: v1.0~4570 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=82e12f20ef88be6335617d7c0077cc66d81acfca;p=gnulib.git openpty, forkpty: Fix build error on Solaris 11.4. * m4/pty_h.m4 (gl_PTY_H): Test for termios.h. Look for the declarations also in . * m4/pty.m4 (gl_FUNC_FORKPTY, gl_FUNC_OPENPTY): Look for the declaration of the function also in . * doc/glibc-functions/openpty.texi: Mention the Solaris 11.4 problems. * doc/glibc-functions/forkpty.texi: Likewise. --- diff --git a/ChangeLog b/ChangeLog index bd2330e95e..c0940d63fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-11-27 Bruno Haible + + openpty, forkpty: Fix build error on Solaris 11.4. + * m4/pty_h.m4 (gl_PTY_H): Test for termios.h. Look for the declarations + also in . + * m4/pty.m4 (gl_FUNC_FORKPTY, gl_FUNC_OPENPTY): Look for the declaration + of the function also in . + * doc/glibc-functions/openpty.texi: Mention the Solaris 11.4 problems. + * doc/glibc-functions/forkpty.texi: Likewise. + 2019-11-27 Bruno Haible New options --enable-threads=isoc and --enable-threads=isoc+posix. diff --git a/doc/glibc-functions/forkpty.texi b/doc/glibc-functions/forkpty.texi index 937005f1ef..c4cf82c165 100644 --- a/doc/glibc-functions/forkpty.texi +++ b/doc/glibc-functions/forkpty.texi @@ -29,13 +29,14 @@ and Mac OS X) linking with @code{-lutil} is not required. On glibc, OpenBSD, NetBSD and FreeBSD linking with @code{-lutil} is required. @item -The function is declared in pty.h on Cygwin -and glibc. It is declared in util.h on Mac OS X, OpenBSD and NetBSD. +The function is declared in pty.h on glibc and Cygwin. +It is declared in util.h on Mac OS X, OpenBSD, and NetBSD. It is declared in libutil.h on FreeBSD. +It is declared in termios.h on Solaris. @item Some platforms declare the function without marking the last two parameters @code{const}. -FreeBSD, Cygwin 1.7.1. +FreeBSD, Solaris 11.4, Cygwin 1.7.1. @end itemize Portability problems not fixed by Gnulib: diff --git a/doc/glibc-functions/openpty.texi b/doc/glibc-functions/openpty.texi index d5f4cf98e5..33f6b74968 100644 --- a/doc/glibc-functions/openpty.texi +++ b/doc/glibc-functions/openpty.texi @@ -29,13 +29,14 @@ and Mac OS X) linking with @code{-lutil} is not required. On glibc, OpenBSD, NetBSD and FreeBSD linking with @code{-lutil} is required. @item -The function is declared in pty.h on Cygwin -and glibc. It is declared in util.h on Mac OS X, OpenBSD and NetBSD. +The function is declared in pty.h on glibc and Cygwin. +It is declared in util.h on Mac OS X, OpenBSD, and NetBSD. It is declared in libutil.h on FreeBSD. +It is declared in termios.h on Solaris. @item Some platforms declare the function without marking the last two parameters @code{const}. -FreeBSD, Cygwin 1.7.1. +FreeBSD, Solaris 11.4, Cygwin 1.7.1. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/pty.m4 b/m4/pty.m4 index 9e60873804..51ad6479d4 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -1,4 +1,4 @@ -# pty.m4 serial 13 +# pty.m4 serial 14 dnl Copyright (C) 2010-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -39,6 +39,9 @@ AC_DEFUN([gl_FUNC_FORKPTY], #if HAVE_LIBUTIL_H # include #endif +#if HAVE_TERMIOS_H +# include +#endif ]]) if test $ac_cv_have_decl_forkpty = yes; then dnl The system has forkpty. @@ -57,6 +60,9 @@ AC_DEFUN([gl_FUNC_FORKPTY], #endif #if HAVE_LIBUTIL_H # include +#endif +#if HAVE_TERMIOS_H +# include #endif ]], [[ int forkpty (int *, char *, struct termios const *, @@ -98,6 +104,9 @@ AC_DEFUN([gl_FUNC_OPENPTY], #if HAVE_LIBUTIL_H # include #endif +#if HAVE_TERMIOS_H +# include +#endif ]]) if test $ac_cv_have_decl_openpty = yes; then AC_DEFINE([HAVE_OPENPTY], [1], @@ -118,6 +127,9 @@ AC_DEFUN([gl_FUNC_OPENPTY], #endif #if HAVE_LIBUTIL_H # include +#endif +#if HAVE_TERMIOS_H +# include #endif ]], [[ int openpty (int *, int *, char *, struct termios const *, diff --git a/m4/pty_h.m4 b/m4/pty_h.m4 index d797f23056..5fb4ddb5a2 100644 --- a/m4/pty_h.m4 +++ b/m4/pty_h.m4 @@ -1,4 +1,4 @@ -# pty_h.m4 serial 10 +# pty_h.m4 serial 11 dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_PTY_H], if test $ac_cv_header_libutil_h = yes; then HAVE_LIBUTIL_H=1 fi + AC_CHECK_HEADERS_ONCE([termios.h]) else # Have , assume forkpty is declared there. HAVE_PTY_H=1 fi @@ -42,6 +43,9 @@ AC_DEFUN_ONCE([gl_PTY_H], #endif #if HAVE_LIBUTIL_H # include +#endif +#if HAVE_TERMIOS_H +# include #endif ]], [forkpty openpty]) ])