X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-winsz1.m4;h=84ecf28e96dc219e3d299e7d8e23c763115ad96c;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=2f2ec9002c2e3a8e2a5070c077d3cb8debf6b8f1;hpb=11896d0dd1e87c291b215a20652505ec1c9dced5;p=gnulib.git

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 2f2ec9002..84ecf28e9 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,39 +1,48 @@
-#serial 5
+# serial 11
+
+# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2014 Free Software
+# Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 dnl From Jim Meyering and Paul Eggert.
-AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
-[AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
+AC_DEFUN([gl_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
+                gl_cv_sys_tiocgwinsz_needs_termios_h,
+  [gl_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>
 #      ifdef TIOCGWINSZ
          yes
 #      endif
-     ], jm_cv_sys_tiocgwinsz_needs_termios_h=yes)
+     ], gl_cv_sys_tiocgwinsz_needs_termios_h=yes)
    fi
   ])
 ])
 
-AC_DEFUN([jm_WINSIZE_IN_PTEM],
-  [AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
+AC_DEFUN([gl_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 $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])
+     gl_cv_sys_struct_winsize_needs_sys_ptem_h,
+     [gl_cv_sys_struct_winsize_needs_sys_ptem_h=yes
+      if test $ac_cv_sys_posix_termios = yes; then
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]],
+          [[struct winsize x;
+            if (sizeof x > 0) return 0;]])],
+          [gl_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])
+      if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/ptem.h>]],
+          [[struct winsize x;
+            if (sizeof x > 0) return 0;]])],
+          [], [gl_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,
+   if test $gl_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])