X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=05a9ea2c47b6bd3a704df9934243d40fbc7a1ec9;hb=67c12453047f009692da518774ed6e49ee0acb9a;hp=e47512a9717308530d758c4944cc93c7da55a4ff;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index e47512a97..05a9ea2c4 100755
--- 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?");
@@ -1081,7 +1106,8 @@ sub getosflags {
 
 	if ($config{OSNAME} =~ /OpenBSD/i) {
 		$config{MAKEPROG} = "gmake";
-		$config{LDLIBS} = $config{LDLIBS} . " -lunwind";
+# apparantly (Dagonet says) that this causes problems, so let's try without it.
+#		$config{LDLIBS} = $config{LDLIBS} . " -lunwind";
 		chomp(my $foo = `eg++ -dumpversion | cut -c 1`);
 		# theyre running the package version of gcc (eg++)... detect it and set up its version numbers.
 		# if theyre not running this, configure lets the build continue but they probably wont manage to
@@ -1159,6 +1185,7 @@ sub writefiles {
 #define OPTIMISATION $config{OPTIMITEMP}
 #define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
+#define ENTRYPOINT int main(int argc, char** argv)
 
 EOF
 print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
@@ -1210,8 +1237,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);