From: serassio <>
Date: Tue, 8 Feb 2005 05:17:54 +0000 (+0000)
Subject: Bug #1178: ufsdump will not compile with --enable-epoll configure option
X-Git-Tag: SQUID_3_0_PRE4~874
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a02a7f878de69baf2b99d35d9c38c703c270f46;p=thirdparty%2Fsquid.git

Bug #1178: ufsdump will not compile with --enable-epoll configure option

usfdump doesn't depend from comm_epoll.cc

With this patch the selection of epoll during configure is now similar to
other comm loops type.
---

diff --git a/configure.in b/configure.in
index 648a744612..f54a83e5df 100644
--- 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.368 2005/01/06 10:44:39 serassio Exp $
+dnl  $Id: configure.in,v 1.369 2005/02/07 22:17:54 serassio 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.368 $)dnl
+AC_REVISION($Revision: 1.369 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -985,8 +985,6 @@ 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. ],
@@ -1000,7 +998,6 @@ AC_ARG_ENABLE(epoll,
                 EPOLL_LIBS="-lepoll"
         fi
         AC_SUBST(EPOLL_LIBS)
-        AM_CONDITIONAL(USE_EPOLL, true)
     ;;
   no)
     echo "Forcing epoll() to be disabled"
diff --git a/src/Makefile.am b/src/Makefile.am
index a21ea03d5d..a2885697ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.104 2005/02/06 13:19:39 serassio Exp $
+#  $Id: Makefile.am,v 1.105 2005/02/07 22:17:55 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -155,13 +155,6 @@ else
 ARP_ACL_SOURCE =
 endif
 
-EPOLL_ALL_SOURCE = comm_epoll.cc
-if USE_EPOLL
-EPOLL_SOURCE = $(EPOLL_ALL_SOURCE)
-else
-EPOLL_SOURCE = 
-endif
-
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
@@ -247,7 +240,6 @@ EXTRA_squid_SOURCES = \
 	dns.cc \
 	dnsserver.cc \
 	dns_internal.cc \
-	$(EPOLL_ALL_SOURCE) \
 	htcp.cc \
 	htcp.h \
 	$(IDENT_ALL_SOURCE) \
@@ -366,6 +358,7 @@ squid_SOURCES = \
 	comm.h \
 	comm_select.cc \
 	comm_poll.cc \
+        comm_epoll.cc \
 	comm_kqueue.cc \
 	CommRead.h \
 	ConfigOption.cc \
@@ -378,7 +371,6 @@ squid_SOURCES = \
 	disk.cc \
 	$(DISKIO_SOURCE) \
 	$(DNSSOURCE) \
-	$(EPOLL_SOURCE) \
 	enums.h \
 	errorpage.cc \
 	$(ESI_SOURCE) \
@@ -636,6 +628,7 @@ ufsdump_SOURCES = debug.cc \
 	comm.h \
 	comm_select.cc \
 	comm_poll.cc \
+        comm_epoll.cc \
 	comm_kqueue.cc \
 	ConfigOption.cc \
 	defines.h \
diff --git a/src/comm_epoll.cc b/src/comm_epoll.cc
index 2ed3ccf3af..da61fa68b9 100644
--- a/src/comm_epoll.cc
+++ b/src/comm_epoll.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_epoll.cc,v 1.6 2004/12/21 18:06:33 hno Exp $
+ * $Id: comm_epoll.cc,v 1.7 2005/02/07 22:17:55 serassio Exp $
  *
  * DEBUG: section 5    Socket functions
  *
@@ -56,6 +56,8 @@
 #include "Store.h"
 #include "fde.h"
 
+#ifdef USE_EPOLL
+
 #define DEBUG_EPOLL 0
 
 #include <sys/epoll.h>
@@ -303,3 +305,4 @@ comm_quick_poll_required(void)
     max_poll_time = 100;
 }
 
+#endif /* USE_EPOLL */