Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / jm-winsz1.m4

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 52653b7..84ecf28 100644 (file)
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,6 +1,7 @@
-#serial 9
+# serial 11
 
-# Copyright (C) 1996, 1999, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+# 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.
@@ -9,8 +10,8 @@ dnl From Jim Meyering and Paul Eggert.
 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],
@@ -19,7 +20,7 @@ AC_DEFUN([gl_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
   ])
 ])
@@ -27,21 +28,21 @@ AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 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;
-          if (sizeof x > 0) return 0;],
-          [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;
-          if (sizeof x > 0) return 0;],
-         [], [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])