From: serassio <>
Date: Tue, 8 Feb 2005 05:30:15 +0000 (+0000)
Subject: Added configure test to see if -lepoll is available when using --enable-epoll:
X-Git-Tag: SQUID_3_0_PRE4~873
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48510020a19d0b0b3267b2bd8ccfe48347f5fe73;p=thirdparty%2Fsquid.git

Added configure test to see if -lepoll is available when using --enable-epoll:

-lepoll is not needed (and may be not present) on kernel 2.6 platforms
with newest glibc, but may be needed on systems updated from 2.4 to 2.6
kernel still using old glibc.
---

diff --git a/configure.in b/configure.in
index f54a83e5df..ca5d4043d9 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.369 2005/02/07 22:17:54 serassio Exp $
+dnl  $Id: configure.in,v 1.370 2005/02/07 22:30:15 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.369 $)dnl
+AC_REVISION($Revision: 1.370 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -994,10 +994,6 @@ AC_ARG_ENABLE(epoll,
   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)
     ;;
   no)
     echo "Forcing epoll() to be disabled"
@@ -2184,6 +2180,8 @@ if test "$ac_cv_func_kqueue" = "yes" ; then
 elif test "$ac_cv_func_epoll" = "yes" ; then
 	SELECT_TYPE="epoll"
 	AC_DEFINE(USE_EPOLL,1,[Use epoll() for the IO loop])
+	AC_CHECK_LIB(epoll, epoll_create, [EPOLL_LIBS="-lepoll"])
+	AC_SUBST(EPOLL_LIBS)
 elif test "$ac_cv_func_poll" = "yes" ; then
         SELECT_TYPE="poll"
         AC_DEFINE(USE_POLL,1,[Use poll() for the IO loop])