pty, readutmp: Fix for FreeBSD 8.0 and OpenBSD 4.6.

* doc/glibc-functions/login_tty.texi: Mention the include file problem
on FreeBSD 8.0 and OpenBSD 4.6.
* lib/pty.in.h: Include <sys/types.h> before <libutil.h>.
* m4/pty_h.m4 (gl_PTY_H): Likewise.
* m4/pty.m4 (gl_FUNC_FORKPTY, gl_FUNC_OPENPTY): Likewise.
* m4/readutmp.m4 (gl_READUTMP): Include <sys/types.h> before <utmp.h>.
Invoke AC_INCLUDES_DEFAULT instead of using the undocumented variable
ac_includes_default.
Reported by Mats Erik Andersson <mats.andersson@gisladisker.se>.

diff --git a/ChangeLog b/ChangeLog
index f3313fe797764c18c355c09ae168a6435bf4bd93..47613441efcb832c4bf888bb8cb128a7278055ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Bruno Haible  <bruno@clisp.org>
+
+       pty, readutmp: Fix for FreeBSD 8.0 and OpenBSD 4.6.
+       * doc/glibc-functions/login_tty.texi: Mention the include file problem
+       on FreeBSD 8.0 and OpenBSD 4.6.
+       * lib/pty.in.h: Include <sys/types.h> before <libutil.h>.
+       * m4/pty_h.m4 (gl_PTY_H): Likewise.
+       * m4/pty.m4 (gl_FUNC_FORKPTY, gl_FUNC_OPENPTY): Likewise.
+       * m4/readutmp.m4 (gl_READUTMP): Include <sys/types.h> before <utmp.h>.
+       Invoke AC_INCLUDES_DEFAULT instead of using the undocumented variable
+       ac_includes_default.
+       Reported by Mats Erik Andersson <mats.andersson@gisladisker.se>.
+
 2010-09-09  Eric Blake  <eblake@redhat.com>
 
        strsignal: work around NetBSD bug

diff --git a/doc/glibc-functions/login_tty.texi b/doc/glibc-functions/login_tty.texi
index 5312313d48dd1906daebbcf441cd0ce18faf7e9c..52b7c731a1e1074918b0740807d5540803914b2f 100644 (file)
--- a/doc/glibc-functions/login_tty.texi
+++ b/doc/glibc-functions/login_tty.texi
@@ -25,5 +25,7 @@ mingw.
 This function is declared in @code{<utmp.h>} on glibc, Cygwin,
 in @code{<util.h>} on MacOS X 10.3, NetBSD 3.0, OpenBSD 3.8,
 in @code{<libutil.h>} on FreeBSD 6.0, Haiku, and not declared at all
-on OSF/1 5.1, Interix 3.5.
+on OSF/1 5.1, Interix 3.5.  Also note that @code{<sys/types.h>} is
+a prerequisite of @code{<utmp.h>} on FreeBSD 8.0, OpenBSD 4.6 and
+of @code{<libutil.h>} on FreeBSD 8.0.
 @end itemize

diff --git a/lib/pty.in.h b/lib/pty.in.h
index af98dfe2ae0048bbec8f2441dfedda75ff568d2c..8d32d71421017e28b76e06022c9778fd7ce97808 100644 (file)
--- a/lib/pty.in.h
+++ b/lib/pty.in.h
@@ -34,6 +34,8 @@
 # include <util.h>
 #endif
 #if @HAVE_LIBUTIL_H@
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+# include <sys/types.h>
 # include <libutil.h>
 #endif
 

diff --git a/m4/pty.m4 b/m4/pty.m4
index 617b1b90f3e16a6234b2d71e6915ccf458d5c248..7fc91caaef75824ad34a0c66bce2e6e828b0b5d0 100644 (file)
--- a/m4/pty.m4
+++ b/m4/pty.m4
@@ -1,4 +1,4 @@
-# pty.m4 serial 7
+# pty.m4 serial 8
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -28,6 +28,8 @@ AC_DEFUN([gl_FUNC_FORKPTY],
   dnl We assume that forkpty exists (possibly in libc, possibly in libutil)
   dnl if and only if it is declared.
   AC_CHECK_DECLS([forkpty],,, [[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif
@@ -45,6 +47,8 @@ AC_DEFUN([gl_FUNC_FORKPTY],
       [gl_cv_func_forkpty_const],
       [AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif
@@ -83,6 +87,8 @@ AC_DEFUN([gl_FUNC_OPENPTY],
   dnl We assume that openpty exists (possibly in libc, possibly in libutil)
   dnl if and only if it is declared.
   AC_CHECK_DECLS([openpty],,, [[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif
@@ -100,6 +106,8 @@ AC_DEFUN([gl_FUNC_OPENPTY],
       [gl_cv_func_openpty_const],
       [AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif

diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index 4b196f786bf28a06119b728eb5f6c84b9a60cf82..138c892495c5bd8cc3ba4f905f18568b43e634e5 100644 (file)
--- a/m4/pty_h.m4
+++ b/m4/pty_h.m4
@@ -1,4 +1,4 @@
-# pty_h.m4 serial 9
+# pty_h.m4 serial 10
 dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,6 +32,8 @@ AC_DEFUN_ONCE([gl_PTY_H],
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
+/* <sys/types.h> is a prerequisite of <libutil.h> on FreeBSD 8.0.  */
+#include <sys/types.h>
 #if HAVE_PTY_H
 # include <pty.h>
 #endif

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index d4c900878a367f14b3eadc3fdbe86d8f6afa8199..16b495b32d6d181d420d653c8f67f5c6f5a7ca79 100644 (file)
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,4 +1,4 @@
-# readutmp.m4 serial 16
+# readutmp.m4 serial 17
 dnl Copyright (C) 2002-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,12 +17,14 @@ AC_DEFUN([gl_READUTMP],
     AC_REQUIRE([AC_C_INLINE])
     AC_CHECK_FUNCS_ONCE([utmpname utmpxname])
     AC_CHECK_DECLS([getutent],,,[
+/* <sys/types.h> is a prerequisite of <utmp.h> on FreeBSD 8.0, OpenBSD 4.6.  */
+#include <sys/types.h>
 #ifdef HAVE_UTMP_H
 # include <utmp.h>
 #endif
 ])
     utmp_includes="\
-$ac_includes_default
+AC_INCLUDES_DEFAULT
 #ifdef HAVE_UTMPX_H
 # include <utmpx.h>
 #endif