X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-winsz2.m4;h=433be0722a2304310d25b3c4ac1dc805abb68e5a;hb=a901e1f94eb5223ea4461dac1c7b4778ea58d8bf;hp=a7d929d04b0810fe1d1035352dfc00d83f133dd1;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index a7d929d04..433be0722 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,23 +1,29 @@
-#serial 4
+# serial 7
 
-AC_DEFUN([jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
-[AC_REQUIRE([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
+# Copyright (C) 1996, 1999, 2001, 2004, 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.
+
+AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
+[AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
-	        jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
-  [jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
+                gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
+  [gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
 
-  if test $jm_cv_sys_tiocgwinsz_needs_termios_h = no; then
+  if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no; then
     AC_EGREP_CPP([yes],
     [#include <sys/types.h>
 #     include <sys/ioctl.h>
 #     ifdef TIOCGWINSZ
         yes
 #     endif
-    ], jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
+    ], gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes)
   fi
   ])
-  if test $jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
-    AC_DEFINE(GWINSZ_IN_SYS_IOCTL, 1,
+  if test $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
+    AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1],
       [Define if your system defines TIOCGWINSZ in sys/ioctl.h.])
   fi
 ])