X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftermios_h.m4;h=d712be3c1902e3c77c21b84d83388e86b19ac6c6;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=151cc4fc968b49a696cbb1a4a90929ac15278e80;hpb=b6d1430494cdd252cd52eca6abf88b1a00f6c983;p=gnulib.git

diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index 151cc4fc9..d712be3c1 100644
--- a/m4/termios_h.m4
+++ b/m4/termios_h.m4
@@ -1,5 +1,5 @@
-# termios_h.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# termios_h.m4 serial 4
+dnl Copyright (C) 2010-2013 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.
@@ -11,12 +11,13 @@ AC_DEFUN([gl_TERMIOS_H],
   AC_REQUIRE([gl_TERMIOS_H_DEFAULTS])
 
   gl_CHECK_NEXT_HEADERS([termios.h])
-
-  AC_CHECK_HEADERS_ONCE([termios.h])
   if test $ac_cv_header_termios_h != yes; then
     HAVE_TERMIOS_H=0
   fi
 
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
   dnl guaranteed by C89.
@@ -37,6 +38,6 @@ AC_DEFUN([gl_TERMIOS_H_DEFAULTS],
 [
   GNULIB_TCGETSID=0;      AC_SUBST([GNULIB_TCGETSID])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_TCGETSID=1;        AC_SUBST([HAVE_TCGETSID])
+  HAVE_DECL_TCGETSID=1;   AC_SUBST([HAVE_DECL_TCGETSID])
   HAVE_TERMIOS_H=1;       AC_SUBST([HAVE_TERMIOS_H])
 ])