X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fpty.m4;h=399c34018ef6521c6a21dc001e91f38524637789;hb=0e789d4c672de575ec384b2059c4779de5b5c664;hp=617b1b90f3e16a6234b2d71e6915ccf458d5c248;hpb=e764ea2fcb9a6247ae4dc0d4c0566b43d950a694;p=gnulib.git

diff --git a/m4/pty.m4 b/m4/pty.m4
index 617b1b90f..399c34018 100644
--- a/m4/pty.m4
+++ b/m4/pty.m4
@@ -1,5 +1,5 @@
-# pty.m4 serial 7
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# pty.m4 serial 9
+dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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
@@ -134,7 +142,10 @@ AC_DEFUN([gl_FUNC_LOGIN_TTY],
 [
   AC_REQUIRE([gl_PTY_LIB])
 
-  AC_CHECK_FUNCS_ONCE([login_tty])
+  gl_saved_libs="$LIBS"
+  LIBS="$LIBS $PTY_LIB"
+  AC_CHECK_FUNCS([login_tty])
+  LIBS="$gl_saved_LIBS"
   if test $ac_cv_func_login_tty = no; then
     AC_LIBOBJ([login_tty])
   fi