From 8be48ca399c3efd0e5d59f53da1b37d02647f33b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Mon, 24 Sep 2007 12:28:25 +0300
Subject: [PATCH] Check headers before testing for fds_bits access method (bug
 #8442)

HP-UX doesn't have sys/select.h, so make sure we don't overzealously include
headers when we try to find out how to use fds_bits.
---
 configure.ac | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 21479e4..9806ae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AC_ARG_ENABLE(wide-prototypes,
 	[WIDEPROTO=$enableval], [WIDEPROTO=auto])
 
 
+AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h])
+
 # Handle Xpoll.h.in
 fds_bits_found=false;
 
@@ -42,8 +44,18 @@ if test "x$fds_bits_found" = xfalse ; then
 			       USE_FDS_BITS="fds_bits"
 			   ],,
 			   [
+                               #ifdef HAVE_SYS_PARAM_H
+                               #include <sys/param.h>
+                               #endif
+                               #ifdef HAVE_SYS_TYPES_H
                                #include <sys/types.h>
+                               #endif
+                               #ifdef HAVE_SYS_TIME_H
+                               #include <sys/time.h>
+                               #endif
+                               #ifdef HAVE_SYS_SELECT_H
 			       #include <sys/select.h>
+                               #endif
 			   ])
 fi
 
@@ -54,8 +66,18 @@ if test "x$fds_bits_found" = xfalse ; then
 			    USE_FDS_BITS="__fds_bits"
 			],,
 			[
-                            #include <sys/types.h>
-			    #include <sys/select.h>
+                               #ifdef HAVE_SYS_PARAM_H
+                               #include <sys/param.h>
+                               #endif
+                               #ifdef HAVE_SYS_TYPES_H
+                               #include <sys/types.h>
+                               #endif
+                               #ifdef HAVE_SYS_TIME_H
+                               #include <sys/time.h>
+                               #endif
+                               #ifdef HAVE_SYS_SELECT_H
+			       #include <sys/select.h>
+                               #endif
 			])
 fi