From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 9 Sep 2012 10:06:53 +0000 (-0600)
Subject: Bug 3615: configure check for default max number of FDs is broken
X-Git-Tag: SQUID_3_2_2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93283ff2ab95c651f0cb41aca9a5e661a1c79aa;p=thirdparty%2Fsquid.git

Bug 3615: configure check for default max number of FDs is broken
---

diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index af09ac92be..fe9f6377e8 100644
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -263,6 +263,7 @@ dnl checks the maximum number of filedescriptor we can open
 dnl sets shell var squid_filedescriptors_num
 
 AC_DEFUN([SQUID_CHECK_MAXFD],[
+AC_CHECK_FUNCS(setrlimit)
 AC_MSG_CHECKING(Maximum number of filedescriptors we can open)
 dnl damn! FreeBSD pthreads break dup2().
 SQUID_STATE_SAVE(maxfd)
diff --git a/configure.ac b/configure.ac
index e8b26394be..8c1499a188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3166,7 +3166,6 @@ AC_CHECK_FUNCS(\
 	seteuid \
 	setgroups \
 	setpgrp \
-	setrlimit \
 	setsid \
 	sigaction \
 	snprintf \