From 82e12f20ef88be6335617d7c0077cc66d81acfca Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Thu, 28 Nov 2019 00:34:34 +0100
Subject: 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 <termios.h>.
* m4/pty.m4 (gl_FUNC_FORKPTY, gl_FUNC_OPENPTY): Look for the declaration
of the function also in <termios.h>.
* doc/glibc-functions/openpty.texi: Mention the Solaris 11.4 problems.
* doc/glibc-functions/forkpty.texi: Likewise.
---
 m4/pty.m4 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'm4/pty.m4')

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 <libutil.h>
 #endif
+#if HAVE_TERMIOS_H
+# include <termios.h>
+#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 <libutil.h>
+#endif
+#if HAVE_TERMIOS_H
+# include <termios.h>
 #endif
           ]], [[
             int forkpty (int *, char *, struct termios const *,
@@ -98,6 +104,9 @@ AC_DEFUN([gl_FUNC_OPENPTY],
 #if HAVE_LIBUTIL_H
 # include <libutil.h>
 #endif
+#if HAVE_TERMIOS_H
+# include <termios.h>
+#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 <libutil.h>
+#endif
+#if HAVE_TERMIOS_H
+# include <termios.h>
 #endif
           ]], [[
             int openpty (int *, int *, char *, struct termios const *,
-- 
cgit v1.2.1