change the order of the comm loop logic to use kqueue/epoll first

if they've been enabled.

The configure code detects poll/select automatically and so they were selected
above epoll/kqueue unless explicitly disabled (--disable-poll --disable-select).

diff --git a/configure.in b/configure.in
index 6b513d7414cbdc32372188a1c9163bb98142dbfa..7e4b86a57867af7ca13fa85d8bcee95040f3e588 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.350 2003/09/15 01:27:09 hno Exp $
+dnl  $Id: configure.in,v 1.351 2004/02/20 03:27:46 adrian Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.350 $)dnl
+AC_REVISION($Revision: 1.351 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -871,7 +871,7 @@ AC_ARG_ENABLE(epoll,
     echo "Forcing epoll() to be enabled"
     ac_cv_func_epoll='yes'
         if test -z "$EPOLL_LIBS"; then
-                EPOLL_LIBS="-lepoll"
+                EPOLL_LIBS=""
         fi
         AC_SUBST(EPOLL_LIBS)
         AM_CONDITIONAL(USE_EPOLL, true)
@@ -1989,18 +1989,18 @@ dnl are actually going to (ab)use
 dnl Actually do the define magic now
 dnl mostly ripped from squid-commloops, thanks to adrian and benno
 
-if test "$ac_cv_func_poll" = "yes" ; then
-        SELECT_TYPE="poll"
-        AC_DEFINE(USE_POLL,1,[Use poll() for the IO loop])
-elif test "$ac_cv_func_select" = "yes" ; then
-        SELECT_TYPE="select"
-        AC_DEFINE(USE_SELECT,1,[Use select() for the IO loop])
-elif test "$ac_cv_func_kqueue" = "yes" ; then
+if test "$ac_cv_func_kqueue" = "yes" ; then
        SELECT_TYPE="kqueue"
        AC_DEFINE(USE_KQUEUE,1,[Use kqueue() for the IO loop])
 elif test "$ac_cv_func_epoll" = "yes" ; then
        SELECT_TYPE="epoll"
        AC_DEFINE(USE_EPOLL,1,[Use epoll() for the IO loop])
+elif test "$ac_cv_func_poll" = "yes" ; then
+        SELECT_TYPE="poll"
+        AC_DEFINE(USE_POLL,1,[Use poll() for the IO loop])
+elif test "$ac_cv_func_select" = "yes" ; then
+        SELECT_TYPE="select"
+        AC_DEFINE(USE_SELECT,1,[Use select() for the IO loop])
 else
         echo "Eep!  Can't find poll, kqueue, epoll, or select!"
         echo "I'll try select and hope for the best."