Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / termios_h.m4

diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index d6b3c06..f8e4458 100644 (file)
--- 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-2014 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.
 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,6 +11,12 @@ AC_DEFUN([gl_TERMIOS_H],
   AC_REQUIRE([gl_TERMIOS_H_DEFAULTS])
 
   gl_CHECK_NEXT_HEADERS([termios.h])
   AC_REQUIRE([gl_TERMIOS_H_DEFAULTS])
 
   gl_CHECK_NEXT_HEADERS([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 Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not


@@ -32,5 +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.
 [
   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])

 ])
 ])