From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Nov 2008 12:29:35 +0000 (+1300)
Subject: Better error reporting and detection for kqueue support
X-Git-Tag: SQUID_3_2_0_1~1316
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11f11b5c256a06884f32bf6a8345c0513afc7905;p=thirdparty%2Fsquid.git

Better error reporting and detection for kqueue support

This only appears when built on Linux.
---

diff --git a/configure.in b/configure.in
index 571562aabe..ad43dcf70e 100644
--- a/configure.in
+++ b/configure.in
@@ -1143,11 +1143,16 @@ AC_ARG_ENABLE(kqueue,
   yes)
     echo "Forcing kqueue() to be enabled"
     SELECT_TYPE="kqueue"
+    AC_CHECK_HEADERS([sys/event.h],[],
+      [ AC_MSG_ERROR([kqueue support requires sys/event.h header file.]) ])
     ;;
   no)
     echo "Forcing kqueue() to be disabled"
     disable_kqueue=true
   ;;
+  *)
+    AC_CHECK_HEADERS([sys/event.h])
+  ;;
 esac
 ])
 
diff --git a/src/comm_kqueue.cc b/src/comm_kqueue.cc
index b87fc2af90..2cce96cfc8 100644
--- a/src/comm_kqueue.cc
+++ b/src/comm_kqueue.cc
@@ -55,16 +55,18 @@
  */
 
 #include "squid.h"
+
+#if USE_KQUEUE
+
 #include "comm_kqueue.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "fde.h"
 #include "SquidTime.h"
 
-#ifdef USE_KQUEUE
-
+#if HAVE_SYS_EVENT_H
 #include <sys/event.h>
-
+#endif
 
 #define KE_LENGTH        128
 
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index ae2428820f..59452e5aaa 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -28,6 +28,7 @@
 #
 #   --enable-ecap \
 #   --enable-epoll \
+#   --enable-kqueue \
 #   --enable-esi \
 #   --enable-win32-service \
 #   --with-localhost-ipv6 \
@@ -65,7 +66,6 @@ OPTS=" \
 	--enable-cache-digests \
 	--enable-poll \
 	--enable-select \
-	--enable-kqueue \
 	--enable-http-violations \
 	--enable-ipfw-transparent \
 	--enable-ipf-transparent \