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 af09ac92be0c14fbdde03cdd3b7768ada9627f16..fe9f6377e84593da6504247b3038fea573e65989 100644 (file)
--- 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 e8b26394bef4de3993bb23c57ba9f7b6cb3834f3..8c1499a18858b04f2078f63d6b45aad62b3f68a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3166,7 +3166,6 @@ AC_CHECK_FUNCS(\
        seteuid \
        setgroups \
        setpgrp \
-       setrlimit \
        setsid \
        sigaction \
        snprintf \