From c322ce4c4f8741091cca86f34336276b91a2e629 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 17 Nov 2001 07:13:12 +0000
Subject: (jm_WINSIZE_IN_PTEM): Do not define WINSIZE_IN_PTEM if <termios.h>
 defines struct winsize.

---
 m4/jm-winsz1.m4 | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'm4')

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 0c43ac32e..2f2ec9002 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,5 +1,5 @@
-dnl From Jim Meyering.
-#serial 4
+#serial 5
+dnl From Jim Meyering and Paul Eggert.
 AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
@@ -19,8 +19,21 @@ AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 ])
 
 AC_DEFUN([jm_WINSIZE_IN_PTEM],
-  [AC_CHECK_HEADER([sys/ptem.h],
-		   AC_DEFINE(WINSIZE_IN_PTEM, 1,
-      [Define if your system defines `struct winsize' in sys/ptem.h.]))
-  ]
-)
+  [AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
+   AC_CACHE_CHECK([whether use of struct winsize requires sys/ptem.h],
+     jm_cv_sys_struct_winsize_needs_sys_ptem_h,
+     [jm_cv_sys_struct_winsize_needs_sys_ptem_h=yes
+      if test $am_cv_sys_posix_termios = yes; then
+	AC_TRY_COMPILE([#include <termios.h>]
+	  [struct winsize x;],
+          [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+      fi
+      if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
+	AC_TRY_COMPILE([#include <sys/ptem.h>],
+	  [struct winsize x;],
+	  [], [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+      fi])
+   if test $jm_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
+     AC_DEFINE([WINSIZE_IN_PTEM], 1,
+       [Define if sys/ptem.h is required for struct winsize.])
+   fi])
-- 
cgit v1.2.3-54-g00ecf