X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Fjm-winsz1.m4;h=67b0e6cddb52a9b458cab008548e65b19c9ef415;hb=f0b08ae92b4d606bd95773c2b3c263d0b83e1172;hp=0fcb46c754fef8e3412d15d52a1ce5a78c7ab44f;hpb=a751838451e58deb9816b34c2a6f218f1ebe0baf;p=gnulib.git

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 0fcb46c75..67b0e6cdd 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,10 +1,17 @@
-#serial 6
+# serial 11
+
+# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2012 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_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 $ac_cv_sys_posix_termios = yes; then
      AC_EGREP_CPP([yes],
@@ -13,27 +20,29 @@ AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_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_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
+     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_TRY_COMPILE([#include <termios.h>]
-	  [struct winsize x;],
-          [jm_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+        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])