X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-winsz1.m4;h=2d99cab3b2eee79f19ee6410c44356207ddd9ee2;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=bde5cc5abb6b3ff524a657379568fc4774a695cd;hpb=5fe5923a00c8e66b8cae09da36b9b4e558cb47d8;p=gnulib.git

diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index bde5cc5ab..2d99cab3b 100644
--- 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-2013 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,7 +10,7 @@ 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],
-	        gl_cv_sys_tiocgwinsz_needs_termios_h,
+                gl_cv_sys_tiocgwinsz_needs_termios_h,
   [gl_cv_sys_tiocgwinsz_needs_termios_h=no
 
    if test $ac_cv_sys_posix_termios = yes; then
@@ -30,18 +31,18 @@ AC_DEFUN([gl_WINSIZE_IN_PTEM],
      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;],
+        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 $gl_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;],
-	  [], [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no])
+        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 $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then
-     AC_DEFINE([WINSIZE_IN_PTEM], 1,
+     AC_DEFINE([WINSIZE_IN_PTEM], [1],
        [Define if sys/ptem.h is required for struct winsize.])
    fi])