Implement /who 1d t (search for who matches for users connected for a given time)

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 616ebfea790f42ddd5db34bae4b7a6865959ee4b..964a4f19d5c57d243cde98f965f8837805f8d162 100755 (executable)
--- a/configure
+++ b/configure
@@ -275,6 +275,7 @@ if (defined $opt_nokqueue)
 {
        $config{USE_KQUEUE} = "n";
 }
+$config{USE_POLL}     = "y";                                   # poll enabled
 $config{USE_EPOLL}       = "y";                                        # epoll enabled
 if (defined $opt_epoll)
 {
@@ -667,8 +668,13 @@ $config{HAS_KQUEUE} = $has_kqueue;
 
 printf "Checking for libgnutls... ";
 if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
-       print "yes\n";
-       $config{HAS_GNUTLS} = "y";
+       if (defined($gnutls_ver) && ($gnutls_ver ne "")) {
+               print "yes\n";
+               $config{HAS_GNUTLS} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_GNUTLS} = "n";
+       }
 } else {
        print "no\n";
        $config{HAS_GNUTLS} = "n";
@@ -676,8 +682,13 @@ if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTL
 
 printf "Checking for openssl... ";
 if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
-       print "yes\n";
-       $config{HAS_OPENSSL} = "y";
+       if (defined($openssl_ver) && ($openssl_ver ne "")) {
+               print "yes\n";
+               $config{HAS_OPENSSL} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_OPENSSL} = "n";
+       }
 } else {
        print "no\n";
        $config{HAS_OPENSSL} = "n";
@@ -791,22 +802,36 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        dir_check("is the IRCd binary to be placed", "BINARY_DIR");
        dir_check("are the IRCd libraries to be placed", "LIBRARY_DIR");
 
+       my $chose_hiperf = 0;
        if ($has_kqueue) {
                yesno('USE_KQUEUE',"You are running a BSD operating system, and kqueue\nwas detected. Would you like to enable kqueue support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable kqueue?");
                print "\n";
+               if ($config{USE_KQUEUE} eq "y") {
+                       $chose_hiperf = 1;
+               }
        }
        if ($has_epoll) {
                yesno('USE_EPOLL',"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
                print "\n";
+               if ($config{USE_EPOLL} eq "y") {
+                       $chose_hiperf = 1;
+               }
        }
        if ($has_ports) {
                yesno('USE_PORTS',"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
                print "\n";
+               if ($config{USE_PORTS} eq "y") {
+                       $chose_hiperf = 1;
+               }
        }
-       my $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
+
        if (!$chose_hiperf) {
-               print "No high-performance socket engines are available, or you chose\n";
-               print "not to enable one. Defaulting to select() engine.\n\n";
+               yesno('USE_POLL', "Would you like to use poll?\n This is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?\n");
+               if ($config{USE_POLL} ne "y")
+               {
+                       print "No high-performance socket engines are available, or you chose\n";
+                       print "not to enable one. Defaulting to select() engine.\n\n";
+               }
        }
 
        yesno('IPV6',"Would you like to build InspIRCd with IPv6 support?");
@@ -1211,8 +1236,17 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
                # user didn't choose either epoll or select for their OS.
                # default them to USE_SELECT (ewwy puke puke)
                if (!$use_hiperf) {
-                       print FILEHANDLE "#define USE_SELECT\n";
-                       $se = "socketengine_select";
+                       print "no hi-perf, " . $config{USE_POLL};
+                       if ($config{USE_POLL} eq "y")
+                       {
+                               print FILEHANDLE "#define USE_POLL\n";
+                               $se = "socketengine_poll";
+                       }
+                       else
+                       {
+                               print FILEHANDLE "#define USE_SELECT\n";
+                               $se = "socketengine_select";
+                       }
                }
                print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
                close(FILEHANDLE);