[5864] check for sys/ioctl.h in configure.ac

[Gavin D. Smith]

Revision: 5864
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5864
Author:   gavin
Date:     2014-10-06 19:33:29 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
check for sys/ioctl.h in configure.ac

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/info/session.c
    trunk/info/termdep.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-10-06 16:32:31 UTC (rev 5863)
+++ trunk/ChangeLog     2014-10-06 19:33:29 UTC (rev 5864)
@@ -14,6 +14,14 @@
        these byte sequences were present in 
        default_emacs_like_info_keys before changes on 2014-06-28.
 
+       * configure.ac: Remove use of AC_HEADER_TIOCGWINSZ.  Add 
+       "sys/ioctl.h" to argument of AC_CHECK_HEADERS.
+       * info/termdep.h: Make include of sys/ioctl.h conditional on 
+       [HAVE_SYS_IOCTL_H] instead of [GWINSZ_IN_SYS_IOCTL].  This gives 
+       the declaration of ioctl for Cygwin.  Report by Ken Brown.
+       * info/session.c: Include of sys/ioctl.h conditional on 
+       [HAVE_SYS_IOCTL_H] instead of [!__MINGW32__].
+
 2014-10-06  Ken Brown  <address@hidden> (tiny change)
 
        * system.h [O_BINARY && !__MSDOS__]: Don't redefine setmode if 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2014-10-06 16:32:31 UTC (rev 5863)
+++ trunk/configure.ac  2014-10-06 19:33:29 UTC (rev 5864)
@@ -142,7 +142,8 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h io.h limits.h pwd.h string.h strings.h \
   termcap.h termio.h termios.h unistd.h \
-  sys/fcntl.h sys/file.h sys/stream.h sys/time.h sys/ttold.h sys/wait.h)
+  sys/fcntl.h sys/file.h sys/ioctl.h sys/stream.h \
+  sys/time.h sys/ttold.h sys/wait.h)
 
 # sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
 AC_CHECK_HEADERS([sys/ptem.h],,,
@@ -152,7 +153,6 @@
 ])
 
 AC_SYS_POSIX_TERMIOS
-AC_HEADER_TIOCGWINSZ
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-10-06 16:32:31 UTC (rev 5863)
+++ trunk/info/session.c        2014-10-06 19:33:29 UTC (rev 5864)
@@ -28,7 +28,7 @@
 #include "footnotes.h"
 #include "man.h"
 
-#ifndef __MINGW32__
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 #ifdef __MINGW32__

Modified: trunk/info/termdep.h
===================================================================
--- trunk/info/termdep.h        2014-10-06 16:32:31 UTC (rev 5863)
+++ trunk/info/termdep.h        2014-10-06 19:33:29 UTC (rev 5864)
@@ -49,7 +49,7 @@
 #  endif /* !HAVE_TERMIO_H */
 #endif /* !HAVE_TERMIOS_H */
 
-#ifdef GWINSZ_IN_SYS_IOCTL
+#ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif