X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=72713d42069383e79b8030d29dfffede75325c8a;hb=53d548355b6657e01bd6a296dc87c4abec271fef;hp=0e143759208c50db06e5ed69ac51b352fa677e6e;hpb=07778c4625a907edb2a6aa14e31f65e527cfd8d0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 0e1437592..72713d420 100755
--- a/configure
+++ b/configure
@@ -29,8 +29,6 @@ GetOptions (
 	'disable-interactive' => \$opt_nointeractive,
 	'with-nick-length=i' => \$opt_nick_length,
 	'with-channel-length=i' => \$opt_chan_length,
-	'with-max-channels=i' => \$opt_maxchans,
-	'with-max-oper-channels=i' => \$opt_opermaxchans,
 	'with-max-clients=i' => \$opt_maxclients,
 	'enable-epoll' => \$opt_epoll,
 	'enable-kqueue' => \$opt_kqueue,
@@ -129,7 +127,9 @@ if (defined $opt_library_dir)
 	$config{LIBRARY_DIR} = $opt_library_dir;
 }
 chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL}  = `openssl version 2>/dev/null`);			# Openssl version
+chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);			# Openssl version
+chomp($gnutls_ver = $config{HAS_GNUTLS});
+chomp($openssl_ver = $config{HAS_OPENSSL});
 $config{USE_GNUTLS}	    = "n";
 if (defined $opt_use_gnutls)
 {
@@ -162,16 +162,6 @@ if (defined $opt_chan_length)
 {
 	$config{CHAN_LENGT} = $opt_chan_length;
 }
-$config{MAX_CHANNE}	 = "20";			     		# Default Max. Channels per user
-if (defined $opt_maxchans)
-{
-	$config{MAX_CHANNE} = $opt_maxchans;
-}
-$config{MAX_OPERCH}	 = "60"; 						# Default Max. Channels per oper
-if (defined $opt_opermaxchans)
-{
-	$config{MAX_OPERCH} = $opt_opermaxchans;
-}
 $config{MAXI_MODES}	 = "20";			     		# Default Max. Number of Modes set at once.
 if (defined $opt_modes)
 {
@@ -262,7 +252,7 @@ if (defined $opt_away)
 	$config{MAX_AWAY} = $opt_away;
 }
 
-$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])?(\-[a-z][0-9])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
+$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
 $config{HAS_OPENSSL} = $1;
 
 if ($config{GCCVER} eq "") {
@@ -583,18 +573,20 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 	print "\n";
 
 	if ($config{IPV6} eq "y") {
-		print "You have chosen to build an \033[1;32mIPV6-only\033[0m server.\nTo accept IPV4 users, you must use the '::ffff:' notation of addresses.\n\n";
+		print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
 		$config{SUPPORT_IP6LINKS} = "y";
 	} else {
-		yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers which are using '::ffff:' notation?\nIf you are using a recent operating\nsystem and are unsure, answer yes.");
+		yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
 		print "\n";
 	}
 
 	if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
-		print "I have detected both GnuTLS and OpenSSL on your system.\n";
+		print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
 		print "I will default to GnuTLS. If you wish to use OpenSSL\n";
 		print "instead, you should enable the OpenSSL module yourself\n";
 		print "by copying it from src/modules/extra to src/modules.\n\n";
+		print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
+		print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
 	}
 
 	if ($config{HAS_GNUTLS} eq "y") {
@@ -608,6 +600,9 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 			print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
 		}
 	}
+	else {
+		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+	}
 
 	print "\nThe following questions will ask you for various figures relating\n";
 	print "To your IRCd install. Please note that these should usually be left\n";
@@ -624,8 +619,6 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 
 	promptnumeric("length of nicknames", "NICK_LENGT");
 	promptnumeric("length of channel names", "CHAN_LENGT");
-	promptnumeric("number of channels a normal user may join at any one time", "MAX_CHANNE");
-	promptnumeric("number of channels an oper may join at any one time", "MAX_OPERCH");
 	promptnumeric("number of mode changes in one line", "MAXI_MODES");
 	promptnumeric("length of an ident (username)", "MAX_IDENT");
 	promptnumeric("length of a quit message", "MAX_QUIT");
@@ -942,8 +935,6 @@ sub writefiles {
 #define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
 #define CHANMAX $CL
-#define MAXCHANS $config{MAX_CHANNE}
-#define OPERMAXCHANS $config{MAX_OPERCH}
 #define MAXMODES $config{MAXI_MODES}
 #define IDENTMAX $config{MAX_IDENT}
 #define MAXQUIT $config{MAX_QUIT}