summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-11-17 07:13:12 +0000
committerJim Meyering <jim@meyering.net>2001-11-17 07:13:12 +0000
commitc322ce4c4f8741091cca86f34336276b91a2e629 (patch)
treefc7b6709c7966e3e673e3d5e12e51e2f6cd403ab
parent9c8f7eb9b7c28f991c50d998d0d407ae64595a32 (diff)
downloadcoreutils-c322ce4c4f8741091cca86f34336276b91a2e629.tar.xz
(jm_WINSIZE_IN_PTEM): Do not define
WINSIZE_IN_PTEM if <termios.h> defines struct winsize.
-rw-r--r--m4/jm-winsz1.m427
1 files changed, 20 insertions, 7 deletions
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])