From: hno <>
Date: Mon, 27 Aug 2007 19:51:47 +0000 (+0000)
Subject: Clean up the comm I/O loop selection to make it less confusing to the user
X-Git-Tag: SQUID_3_0_PRE7~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6564c39773ef38cb38b7929db8ce4a053dedacb2;p=thirdparty%2Fsquid.git

Clean up the comm I/O loop selection to make it less confusing to the user
---

diff --git a/configure.in b/configure.in
index 59bc8839fd..a868dcdd90 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.469 2007/08/27 13:37:02 hno Exp $
+dnl  $Id: configure.in,v 1.470 2007/08/27 13:51:47 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.469 $)dnl
+AC_REVISION($Revision: 1.470 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -795,7 +795,6 @@ if [ "$USE_SNMP" ]; then
     AC_DEFINE(SQUID_SNMP,1,[Define to enable SNMP monitoring of Squid])
     SNMPLIB='../snmplib/libsnmp.a'
     makesnmplib=snmplib
-else
 fi
 AM_CONDITIONAL(USE_SNMP, [test x$USE_SNMP == xtrue])
 AC_SUBST(SNMPLIB)
@@ -993,78 +992,76 @@ AC_ARG_WITH(coss-membuf-size,
 ])
 
 dnl check for netio plugin stuff
+
 dnl Enable poll()
+disable_poll=
 AC_ARG_ENABLE(poll,
-[  --enable-poll           Enable poll() support.
-  --disable-poll          Disable poll() support. ],
+[  --disable-poll          Disable poll() support. ],
 
 [
   case "$enableval" in
   yes)
     echo "Forcing poll() to be enabled"
-    ac_cv_func_poll='yes'
     SELECT_TYPE="poll"
     ;;
   no)
     echo "Forcing poll() to be disabled"
-    ac_cv_func_poll='no'
+    disable_poll=true
     ;;
   esac
 ])
 
 dnl Enable select()
+disable_select=
 AC_ARG_ENABLE(select,
-[  --enable-select         Enable select() support.
-  --disable-select        Disable select() support. ],
+[  --disable-select        Disable select() support. ],
 
 [
   case "$enableval" in
   yes)
     echo "Forcing select() to be enabled"
-    ac_cv_func_select='yes'
     SELECT_TYPE="select"
     ;;
   no)
     echo "Forcing select() to be disabled"
-    ac_cv_func_select='no'
+    disable_select=true
     ;;
   esac
 ])
 
 dnl Enable kqueue()
+dnl kqueue support is still experiemntal and unstable. Not enabled by default.
+disable_kqueue=true
 AC_ARG_ENABLE(kqueue,
-[  --enable-kqueue         Enable kqueue() support (experimental).
-  --disable-kqueue        Disable kqueue() support. ],
+[  --enable-kqueue         Enable kqueue() support (experimental).],
 
 [
   case "$enableval" in
   yes)
     echo "Forcing kqueue() to be enabled"
-    ac_cv_func_kqueue='yes'
     SELECT_TYPE="kqueue"
     ;;
   no)
     echo "Forcing kqueue() to be disabled"
-    ac_cv_func_kqueue='no'
+    disable_kqueue=true
   ;;
 esac
 ])
 
 dnl Enable epoll()
+disable_epoll=
 AC_ARG_ENABLE(epoll,
-[  --enable-epoll          Enable epoll() support.
-  --disable-epoll         Disable epoll() support. ],
+[  --disable-epoll         Disable epoll() support.],
 
 [
   case "$enableval" in
   yes)
     echo "Forcing epoll() to be enabled"
-    ac_cv_func_epoll_ctl='yes'
     SELECT_TYPE="epoll"
     ;;
   no)
     echo "Forcing epoll() to be disabled"
-    ac_cv_func_epoll_ctl='no'
+    disable_epoll=true
   ;;
 esac
 ])
@@ -2614,14 +2611,13 @@ dnl mostly ripped from squid-commloops, thanks to adrian and benno
 
 if test -n "$SELECT_TYPE"; then
 	: # Already decided above. Nothing to do here
-elif test "$ac_cv_epoll_works" = "yes" ; then
+elif test -z "$disable_epoll" && test "$ac_cv_epoll_works" = "yes" ; then
 	SELECT_TYPE="epoll"
-#comm_kqueue a bit broken. Don't enable automatically
-#elif test "$ac_cv_func_kqueue" = "yes" ; then
-#	SELECT_TYPE="kqueue"
-elif test "$ac_cv_func_poll" = "yes" ; then
+elif test -z "$disable_kqueue" && test "$ac_cv_func_kqueue" = "yes" ; then
+	SELECT_TYPE="kqueue"
+elif test -z "$disable_poll" && test "$ac_cv_func_poll" = "yes" ; then
         SELECT_TYPE="poll"
-elif test "$ac_cv_func_select" = "yes" ; then
+elif test -z "$disable_select" && test "$ac_cv_func_select" = "yes" ; then
 	case "$host_os" in
 	mingw|mingw32)
 	        SELECT_TYPE="select_win32"