From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 30 Aug 2012 16:32:59 +0000 (-0600)
Subject: Bug 3615: configure check for default max number of FDs is broken
X-Git-Tag: sourceformat-review-1~14^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0292eeb76eda5693c4c895d15b5862597409c916;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 2e6b80632c..8fb597e2c9 100644
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -262,6 +262,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 033c3776e2..30c02d04b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3177,7 +3177,6 @@ AC_CHECK_FUNCS(\
 	seteuid \
 	setgroups \
 	setpgrp \
-	setrlimit \
 	setsid \
 	sigaction \
 	snprintf \