Better error reporting and detection for kqueue support

This only appears when built on Linux.

diff --git a/configure.in b/configure.in
index 571562aabe16afccef4fa5d55e89a25fd2484459..ad43dcf70eb0dab56d737e6f7172428145fc0e0d 100644 (file)
--- 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 b87fc2af90bad7e0071b88a10e4824a50d580fe3..2cce96cfc813569c5c7ae1a522cf517f6a2e3c4e 100644 (file)
--- 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 ae2428820f1fde4f260ec75bdbaa765ec9ce65f8..59452e5aaa3bd10658d3254d43319ddd833c04fd 100644 (file)
--- 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 \