1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
$NetBSD: patch-ah,v 1.4 2006/12/21 16:13:54 jmmv Exp $
--- configure.orig 2004-09-18 04:17:45.000000000 +0200
+++ configure
@@ -2370,7 +2370,6 @@ if test x"$CFLAGS" != x; then
fi
if test x"$CFLAGS" != x; then
unet_old_cflags=$CFLAGS
- CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//g'`
fi
if test x"$CFLAGS" != x"$unet_old_cflags"; then
# If -g was already there, force symbols to be enabled
@@ -7237,7 +7236,7 @@ echo "${ECHO_T}OpenBSD ($host) found." >
OSDEP_C=os_openbsd.c
;;
- *-*bsd*)
+ *-*bsd* | *-dragonfly*)
echo "$as_me:$LINENO: result: Generic BSD ($host) found." >&5
echo "${ECHO_T}Generic BSD ($host) found." >&6
if test x"$ac_cv_header_poll_h" = xyes; then
@@ -7968,9 +7967,25 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-unet_maxcon=`ulimit -Hn`
-if test x"$unet_maxcon" = xunlimited; then
- unet_maxcon=`ulimit -Sn`
+if test x$unet_poll_syscall = xno; then
+ # Avoid usage of ulimit. pkgsrc removes some limits at run time and
+ # that raises the values too much in some cases to confuse the code in
+ # s_bsd.c (seen in Mac OS X 10.4). Better use FD_SETSIZE as that is
+ # the maximum value the code will be able to handle when using the
+ # select(2) system call.
+ cat >./conftest.c <<_ACEOF
+#include <sys/select.h>
+#include <stdio.h>
+int main(void) { printf("%d\n", FD_SETSIZE); return 0; }
+_ACEOF
+ cc -o ./conftest ./conftest.c
+ unet_maxcon=`./conftest`
+ rm ./conftest ./conftest.c
+else
+ unet_maxcon=`ulimit -Hn`
+ if test x"$unet_maxcon" = xunlimited; then
+ unet_maxcon=`ulimit -Sn`
+ fi
fi
unet_maxcon=`expr $unet_maxcon - 4`
echo "$as_me:$LINENO: checking max connections" >&5
@@ -8002,7 +8017,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
- ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile"
+ ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile tools/Makefile.crypt"
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -8534,6 +8549,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"ircd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ircd/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "tools/Makefile.crypt" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile.crypt" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
