X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-winsz1.m4;h=0fcb46c754fef8e3412d15d52a1ce5a78c7ab44f;hb=7dd7a67c1fc5fbf657c2ffbd03c334310d368cb0;hp=492267e7afeb7044ac7c9daa5ab8e7548bd8e1c9;hpb=99f2780e17448c744c808e18ec8e0646b6b67348;p=gnulib.git

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 492267e7a..0fcb46c75 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,12 +1,12 @@
-dnl From Jim Meyering.
-#serial 2
-AC_DEFUN(jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H,
-[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
+#serial 6
+dnl From Jim Meyering and Paul Eggert.
+AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
+[AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
 	        jm_cv_sys_tiocgwinsz_needs_termios_h,
   [jm_cv_sys_tiocgwinsz_needs_termios_h=no
 
-   if test $am_cv_sys_posix_termios = yes; then
+   if test $ac_cv_sys_posix_termios = yes; then
      AC_EGREP_CPP([yes],
      [#include <sys/types.h>
 #      include <termios.h>
@@ -18,9 +18,22 @@ 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_DEFUN([jm_WINSIZE_IN_PTEM],
+  [AC_REQUIRE([AC_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 $ac_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])