Configure fixes; don't always use poll socket engine, better detection at when poll should be used also. Testing appreciated, as my perl sucks.

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@10263 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2008-08-25 00:59:11 +00:00
parent 933d60cc97
commit 68a9f6c266

31
configure vendored
View File

@ -1151,29 +1151,38 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) { if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
print FILEHANDLE "#define USE_KQUEUE\n"; print FILEHANDLE "#define USE_KQUEUE\n";
$se = "socketengine_kqueue"; $se = "socketengine_kqueue";
$use_hiperf = 1; if ($config{USE_KQUEUE} eq "y") {
$use_hiperf = 1;
}
} }
if (($has_epoll) && ($config{USE_EPOLL} eq "y")) { if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
print FILEHANDLE "#define USE_EPOLL\n"; print FILEHANDLE "#define USE_EPOLL\n";
$se = "socketengine_epoll"; $se = "socketengine_epoll";
$use_hiperf = 1; if ($config{USE_EPOLL} eq "y") {
$use_hiperf = 1;
}
} }
if (($has_ports) && ($config{USE_PORTS} eq "y")) { if (($has_ports) && ($config{USE_PORTS} eq "y")) {
print FILEHANDLE "#define USE_PORTS\n"; print FILEHANDLE "#define USE_PORTS\n";
$se = "socketengine_ports"; $se = "socketengine_ports";
$use_hiperf = 1; if ($config{USE_PORTS} eq "y") {
} $use_hiperf = 1;
if ($config{USE_POLL} eq "y") }
{
print FILEHANDLE "#define USE_POLL\n";
$se = "socketengine_poll";
$use_hiperf = 1;
} }
# user didn't choose either epoll or select for their OS. # user didn't choose either epoll or select for their OS.
# default them to USE_SELECT (ewwy puke puke) # default them to USE_SELECT (ewwy puke puke)
if (!$use_hiperf) { if (!$use_hiperf) {
print FILEHANDLE "#define USE_SELECT\n"; if ($config{USE_POLL} eq "y")
$se = "socketengine_select"; {
print FILEHANDLE "#define USE_POLL\n";
$se = "socketengine_poll";
}
else
{
print FILEHANDLE "#define USE_SELECT\n";
$se = "socketengine_select";
}
} }
print FILEHANDLE "\n#endif\n"; print FILEHANDLE "\n#endif\n";
close(FILEHANDLE); close(FILEHANDLE);