X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=64059152d0bcb4ac776b9f61b590f0469e9673cf;hb=d544f077bad47d6a499a07706604e84b417ab24d;hp=db984b38ee263fe9eebc8378824e2a426a83fb6c;hpb=b02af8b2a9787c3fad7e317540dbfef72610d53e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index db984b38e..64059152d 100755
--- a/configure
+++ b/configure
@@ -37,17 +37,15 @@ $config{MAX_OPERCH}         = "60"; 						# Default Max. Channels per oper
 $config{MAXI_MODES}         = "20";                             		# Default Max. Number of Modes set at once.
 $config{HAS_STRLCPY}        = "false";                          		# strlcpy Check.
 $config{HAS_STDINT}         = "false";						# stdint.h check
-$config{HAS_EXECINFO}       = "0";						# execinfo.h Check.
 $config{USE_KQUEUE}         = "y";						# kqueue enabled
 $config{USE_EPOLL}          = "y";						# epoll enabled
-$config{THREADED_DNS}       = "n";						# threaded dns
 $config{IPV6}               = "n";						# IPv6 support (experimental)
 $config{SUPPORT_IP6LINKS}   = "y";						# IPv4 supporting IPv6 links (experimental)
 $config{STATIC_LINK}	    = "no";						# are doing static modules?
 chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);           		# FD Limit
 chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);			# Hard FD Limit
 chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   		# Major GCC Version
-chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
+chomp($config{OSNAME}       = `uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
 $config{MAKEORDER}	    = "ircd mods";					# build order
 $config{STATICLIBS}         = "";						# library archive path
@@ -60,7 +58,7 @@ $config{MAX_AWAY}           = "200";						# max AWAY size
 
 $no_svn = 0;
 
-$config{HAS_OPENSSL} =~ /OpenSSL (\S+) \d+ \S+ \d{4}/;
+$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
 $config{HAS_OPENSSL} = $1;
 
 if ($config{GCCVER} eq "") {
@@ -197,27 +195,6 @@ if (!$fail) {
 print "yes\n" if $config{HAS_STRLCPY} eq "true";
 print "no\n" if $config{HAS_STRLCPY} eq "false";
 
-printf "Checking if execinfo.h exists... ";
-$config{HAS_EXECINFO} = "0";
-my $fail = 0;
-open(EXECINFO, "</usr/include/execinfo.h") or $fail = 1;
-if ($fail) {
-	$fail = 0;
-	open(EXECINFO, "</usr/local/include/execinfo.h") or $fail = 1;
-	if (!$fail) {
-		printf "/usr/local/include/execinfo.h\n";
-		$config{HAS_EXECINFO} = "1";
-		close(EXECINFO);
-	}
-	else {
-		printf "Not found!\n";
-	}
-}
-else {
-	printf "/usr/include/execinfo.h\n";
-	$config{HAS_EXECINFO} = "1";
-	close(EXECINFO);
-}
 
 printf "Checking if kqueue exists... ";
 $has_kqueue = 0;
@@ -689,7 +666,6 @@ print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.x\033[0m\n";
 print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
 print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n";
 print "\033[0mStatic modules:\033[1;32m\t\t\t$config{STATIC_LINK}\033[0m\n";
-print "\033[0mMultithread DNS:\033[1;32m\t\t$config{THREADED_DNS}\033[0m\n";
 print "\033[0mIPv6 Support:\033[1;32m\t\t\t$config{IPV6}\033[0m\n";
 print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$config{SUPPORT_IP6LINKS}\033[0m\n";
 print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$config{USE_GNUTLS}\033[0m\n";
@@ -852,7 +828,7 @@ sub dir_check {
 			if (($tmp eq "") || ($tmp =~ /^y/i)) {
 				# Attempt to Create the Dir..
 				
-				print("mkdir -p \"$var\" >> /dev/null 2>&1");
+				system("mkdir -p \"$var\" >> /dev/null 2>&1");
 				$chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
 				if ($chk != 0) {
 					print "Unable to create directory. ($var)\n\n";
@@ -880,7 +856,7 @@ sub dir_check {
 
 sub getosflags {
 	if ($config{OSNAME} =~ /BSD$/) {
-		$config{LDLIBS} = "-Ldl -lstdc++";
+		$config{LDLIBS} = "-lstdc++";
 		$config{FLAGS}  = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 		$config{MAKEPROG} = "gmake";
 		if ($config{OSNAME} eq "OpenBSD") {
@@ -1032,9 +1008,6 @@ EOF
 		if ($config{OSNAME} eq "CYG-STATIC") {
 			print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
 		}
-		if ($config{HAS_EXECINFO} eq "1") {
-			print FILEHANDLE "#define HAS_EXECINFO\n";
-		}
 		if ($config{STATIC_LINK} eq "yes") {
 			print FILEHANDLE "#define STATIC_LINK\n";
 		}
@@ -1047,9 +1020,6 @@ EOF
 		if ($config{HAS_STDINT} eq "true") {
 			print FILEHANDLE "#define HAS_STDINT\n";
 		}
-		if ($config{THREADED_DNS} =~ /y/i) {
-			print FILEHANDLE "#define THREADED_DNS\n";
-		}
 		if ($config{IPV6} =~ /y/i) {
 			print FILEHANDLE "#define IPV6\n";
 		}
@@ -1117,9 +1087,7 @@ EOF
 	}
 
 	opendir(DIRHANDLE, $this);
-	if ($config{THREADED_DNS} =~ /y/i) {
-		$config{LDLIBS} = $config{LDLIBS} . " -pthread";
-	}
+
 	foreach $name (sort readdir(DIRHANDLE)) {
 		if ($name =~ /^\.(.+)\.inc$/) {
 			$file = $1;
@@ -1545,19 +1513,13 @@ sub write_dynamic_makefile {
 		$srcobjs = $srcobjs . "cmd_$cmd.cpp ";
 	}
 
-if (($config{OSNAME} !~ /Linux/i) && ($config{HAS_EXECINFO} eq "1")) {
-	$extra = "-L/usr/local/lib -lexecinfo";
-} else {
-	$extra = "";
-}
-
-$se = "socketengine_select";
-if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-	$se = "socketengine_kqueue";
-}
-elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-	$se = "socketengine_epoll";
-}
+	$se = "socketengine_select";
+	if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+		$se = "socketengine_kqueue";
+	}
+	elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+		$se = "socketengine_epoll";
+	}
 
 	open(FH,">src/Makefile") or die("Could not write src/Makefile");
 	print FH <<EOM;