summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure13
1 files changed, 8 insertions, 5 deletions
diff --git a/configure b/configure
index 3cceec02e..241dfcd4f 100755
--- a/configure
+++ b/configure
@@ -27,8 +27,8 @@ $config{CHAN_LENGT} = "64"; # Default Chan
$config{MAX_CHANNE} = "20"; # Default Max. Channels per user..
$config{MAXI_MODES} = "20"; # Default Max. Number of Modes set at once.
$config{HAS_STRLCPY} = "false"; # strlcpy Check.
-$config{USE_KQUEUE} = "n"; # kqueue enabled
-$config{USE_EPOLL} = "n"; # epoll enabled
+$config{USE_KQUEUE} = "y"; # kqueue enabled
+$config{USE_EPOLL} = "y"; # epoll enabled
chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`); # FD Limit
chomp($config{GCCVER} = `gcc -dumpversion | cut -c 1`); # Major GCC Version
chomp($config{GCC34} = `gcc -dumpversion | cut -c 3`); # Minor GCC Version
@@ -443,15 +443,18 @@ EOF
if ($config{HAS_STRLCPY} eq "true") {
print FILEHANDLE "#define HAS_STRLCPY\n";
}
- if ($config{USE_KQUEUE} eq "y") {
+ my $use_hiperf = 0;
+ if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
print FILEHANDLE "#define USE_KQUEUE\n";
+ $use_hiperf = 1;
}
- if ($config{USE_EPOLL} eq "y") {
+ if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
print FILEHANDLE "#define USE_EPOLL\n";
+ $use_hiperf = 1;
}
# user didn't choose either epoll or select for their OS.
# default them to USE_SELECT (ewwy puke puke)
- if (($config{USE_EPOLL} eq "n") && ($config{USE_KQUEUE} eq "n")) {
+ if (!$use_hiperf) {
print FILEHANDLE "#define USE_SELECT\n";
}
close(FILEHANDLE);