---------------------
PatchSet 307 
Date: 2002/12/10 20:19:39
Author: venturaville
Branch: epoll
Tag: (none) 
Log:
Fixed problem with bootstrapping code because of epoll additions

Members: 
	configure.in:1.14.2.1->1.14.2.2 
	src/Makefile.am:1.10.6.1->1.10.6.2 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- squid3/configure.in	9 Dec 2002 16:06:25 -0000	1.14.2.1
+++ squid3/configure.in	10 Dec 2002 20:19:39 -0000	1.14.2.2
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.14.2.1 2002/12/09 16:06:25 venturaville Exp $
+dnl  $Id: configure.in,v 1.14.2.2 2002/12/10 20:19:39 venturaville Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.14.2.1 $)dnl
+AC_REVISION($Revision: 1.14.2.2 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -744,6 +744,7 @@
 ])
 
 dnl Enable epoll()
+AM_CONDITIONAL(USE_DNSSERVER, false)
 AC_ARG_ENABLE(epoll,
 [ --enable-epoll          Enable epoll() support.
   --disable-epoll        Disable epoll() support. ],
@@ -753,10 +754,12 @@
   yes)
     echo "Forcing epoll() to be enabled"
     ac_cv_func_epoll='yes'
-	if test -z "$EPOLL_LIBS"; then
-		EPOLL_LIBS="-lepoll"
-	fi
-	AC_SUBST(EPOLL_LIBS)
+        if test -z "$EPOLL_LIBS"; then
+                EPOLL_LIBS="-lepoll"
+        fi
+        AC_SUBST(EPOLL_LIBS)
+    AC_DEFINE(USE_EPOLL,1,[Use epoll type polling])
+    AM_CONDITIONAL(USE_EPOLL, true)
     ;;
   no)
     echo "Forcing epoll() to be disabled"
@@ -765,6 +768,7 @@
 esac
 ])
 
+
 dnl Disable HTTP violations
 http_violations=1
 AC_ARG_ENABLE(http-violations,
Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.10.6.1
retrieving revision 1.10.6.2
diff -u -r1.10.6.1 -r1.10.6.2
--- squid3/src/Makefile.am	9 Dec 2002 16:06:25 -0000	1.10.6.1
+++ squid3/src/Makefile.am	10 Dec 2002 20:19:40 -0000	1.10.6.2
@@ -1,16 +1,11 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.10.6.1 2002/12/09 16:06:25 venturaville Exp $
+#  $Id: Makefile.am,v 1.10.6.2 2002/12/10 20:19:40 venturaville Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
 
-if USE_EPOLL
-EPOLL_LIBS = -lepoll
-else
-EPOLL_LIBS =
-endif
 
 if USE_DNSSERVER
 DNSSOURCE = dns.cc