Summary: Fix bug #576

Keywords:

Configure.in now only sets USE_EPOLL to 1 when EPOLL is the chosen comms interface. This means to build with epoll, you need --disable-poll --enable-epoll
Altered the use of USE_EPOLL from #ifdef to #if.

diff --git a/configure.in b/configure.in
index d87a99c25365dcf975cfcae7d49bbddf48466ff6..2a3d44427395993d17f835c2abc8c372cd284271 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.329 2003/03/11 22:11:37 robertc Exp $
+dnl  $Id: configure.in,v 1.330 2003/04/22 07:38:29 robertc 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-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.329 $)dnl
+AC_REVISION($Revision: 1.330 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -826,6 +826,7 @@ esac
 
 dnl Enable epoll()
 AM_CONDITIONAL(USE_EPOLL, false)
+AC_DEFINE(USE_EPOLL,0,[Use epoll type polling])
 AC_ARG_ENABLE(epoll,
 [ --enable-epoll          Enable epoll() support.
   --disable-epoll        Disable epoll() support. ],
@@ -839,8 +840,7 @@ AC_ARG_ENABLE(epoll,
                 EPOLL_LIBS="-lepoll"
         fi
         AC_SUBST(EPOLL_LIBS)
-    AC_DEFINE(USE_EPOLL,1,[Use epoll type polling])
-    AM_CONDITIONAL(USE_EPOLL, true)
+        AM_CONDITIONAL(USE_EPOLL, true)
     ;;
   no)
     echo "Forcing epoll() to be disabled"

diff --git a/src/comm_epoll.cc b/src/comm_epoll.cc
index ea8feb22c8d81eb502973bad4f953a17359c8452..bde8e526c96a23b9dfe2dfeff0e931c422e2c5bf 100644 (file)
--- a/src/comm_epoll.cc
+++ b/src/comm_epoll.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_epoll.cc,v 1.2 2003/03/04 06:02:12 robertc Exp $
+ * $Id: comm_epoll.cc,v 1.3 2003/04/22 07:38:30 robertc Exp $
  *
  * DEBUG: section 5    Socket functions
  *
@@ -56,7 +56,7 @@
 #include "Store.h"
 #include "fde.h"
 
-#ifdef USE_EPOLL
+#if USE_EPOLL
 #define DEBUG_EPOLL 0
 
 #include <sys/epoll.h>