X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=e1bcc153d55f46b65f769f3724ac3a115c72245a;hb=206e3b49c7bfe3e8a7ca972103fe9e30feb3a86a;hp=db0dd70e0bfde3d3b89979a842a485eb47db90a6;hpb=772dc6c47406b0ca6be5e49914dd739c8d580bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index db0dd70e0..e1bcc153d 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,6 @@
 #
 ########################################
 
-
 require 5.6.0;
 use Socket;
 use Cwd;
@@ -24,6 +23,8 @@ use Getopt::Long;
 # Utility functions for our buildsystem
 use make::utilities;
 use make::configure;
+use make::gnutlscert;
+use make::opensslcert;
 
 GetOptions (
 	'enable-gnutls' => \$opt_use_gnutls,
@@ -46,6 +47,7 @@ GetOptions (
 	'with-ident-length=i' => \$opt_ident,
 	'with-quit-length=i' => \$opt_quit,
 	'with-topic-length=i' => \$opt_topic,
+	'with-maxbuf=i' => \$opt_maxbuf,
 	'with-kick-length=i' => \$opt_kick,
 	'with-gecos-length=i' => \$opt_gecos,
 	'with-away-length=i' => \$opt_away,
@@ -94,6 +96,7 @@ my $non_interactive = (
 	(defined $opt_nokqueue) ||
 	(defined $opt_noepoll) ||
 	(defined $opt_noports) ||
+	(defined $opt_maxbuf) ||
 	(defined $opt_use_gnutls)
 );
 my $interactive = !$non_interactive;
@@ -101,9 +104,9 @@ my $interactive = !$non_interactive;
 
 chomp($topdir = getcwd());
 $this = resolve_directory($topdir);						# PWD, Regardless.
-@modlist = ();						  		# Declare for Module List..
-%config = ();						   		# Initiate Configuration Hash..
-$config{ME}		 = resolve_directory($topdir);			# Present Working Directory
+@modlist = ();							  		# Declare for Module List..
+%config = ();						   			# Initiate Configuration Hash..
+$config{ME}		 = resolve_directory($topdir);				# Present Working Directory
 
 $config{BASE_DIR}	   = $config{ME};
 
@@ -112,8 +115,8 @@ if (defined $opt_base_dir)
 	$config{BASE_DIR} = $opt_base_dir;
 }
 
-$config{CONFIG_DIR}	 = resolve_directory($config{BASE_DIR}."/conf");		# Configuration Directory
-$config{MODULE_DIR}	 = resolve_directory($config{BASE_DIR}."/modules");		# Modules Directory
+$config{CONFIG_DIR}	 = resolve_directory($config{BASE_DIR}."/conf");	# Configuration Directory
+$config{MODULE_DIR}	 = resolve_directory($config{BASE_DIR}."/modules");	# Modules Directory
 $config{BINARY_DIR}	 = resolve_directory($config{BASE_DIR}."/bin");		# Binary Directory
 $config{LIBRARY_DIR}	= resolve_directory($config{BASE_DIR}."/lib");		# Library Directory
 
@@ -134,13 +137,13 @@ 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}  = `pkg-config --modversion openssl 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)
 {
-	$config{USE_GNUTLS} = "y";						# Use gnutls.
+	$config{USE_GNUTLS} = "y";					# Use gnutls.
 }
 $config{USE_OPENSSL}	= "n";						# Use openssl.
 if (defined $opt_use_openssl)
@@ -149,14 +152,14 @@ if (defined $opt_use_openssl)
 }
 
 # no, let's not change these.
-$config{OPTIMITEMP}	 = "0";			      		# Default Optimisation Value
+$config{OPTIMITEMP}	 = "0";			      			# Default Optimisation Value
 if (!defined $opt_disable_debug)
 {
 	$config{OPTIMISATI}	 = "-g1";			     	# Optimisation Flag
 }
 else
 {
-	$config{OPTIMISATI}	 = "-O2";					# DEBUGGING OFF!
+	$config{OPTIMISATI}	 = "-O2";				# DEBUGGING OFF!
 }
 
 $config{NICK_LENGT}	 = "31";			     		# Default Nick Length
@@ -175,7 +178,7 @@ if (defined $opt_modes)
 	$config{MAXI_MODES} = $opt_modes;
 }
 $config{HAS_STRLCPY}	= "false";			  		# strlcpy Check.
-$config{HAS_STDINT}	 = "false";						# stdint.h check
+$config{HAS_STDINT}	 = "false";					# stdint.h check
 $config{USE_KQUEUE}	 = "y";						# kqueue enabled
 if (defined $opt_kqueue)
 {
@@ -185,7 +188,7 @@ if (defined $opt_nokqueue)
 {
 	$config{USE_KQUEUE} = "n";
 }
-$config{USE_EPOLL}	  = "y";						# epoll enabled
+$config{USE_EPOLL}	  = "y";					# epoll enabled
 if (defined $opt_epoll)
 {
 	$config{USE_EPOLL} = "y";
@@ -194,7 +197,7 @@ if (defined $opt_noepoll)
 {
 	$config{USE_EPOLL} = "n";
 }
-$config{USE_PORTS}	  = "y";						# epoll enabled
+$config{USE_PORTS}	  = "y";					# epoll enabled
 if (defined $opt_ports)
 {
 	$config{USE_PORTS} = "y";
@@ -208,7 +211,7 @@ if (defined $opt_ipv6)
 {
 	$config{IPV6} = "y";
 }
-$config{SUPPORT_IP6LINKS}   = "y";						# IPv4 supporting IPv6 links (experimental)
+$config{SUPPORT_IP6LINKS}   = "y";					# IPv4 supporting IPv6 links (experimental)
 if (defined $opt_ipv6links)
 {
 	$config{SUPPORT_IP6LINKS} = "y";
@@ -217,13 +220,13 @@ if (defined $opt_noipv6links)
 {
 	$config{SUPPORT_IP6LINKS} = "n";
 }
-$config{STATIC_LINK}	    = "no";						# are doing static modules?
+$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
-$config{_SOMAXCONN} = SOMAXCONN;						# Max connections in accept queue
+chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);		# Hard FD Limit
+chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   	# Major GCC Version
+$config{_SOMAXCONN} = SOMAXCONN;					# Max connections in accept queue
 $config{OSNAME}       	    = $^O;			      		# Operating System Name
-$config{IS_DARWIN}          = "NO";						# Is OSX?
+$config{IS_DARWIN}          = "NO";					# Is OSX?
 if ($config{OSNAME} =~ /darwin/i)
 {
 	$config{IS_DARWIN} = "YES";
@@ -234,15 +237,16 @@ if (defined $opt_cc)
 	$config{CC} = $opt_cc;
 }
 $exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}       = `$exec`);						# Major GCC Version
-$config{MAKEORDER}	    = "ircd mods";					# build order
-$config{STATICLIBS}	 = "";						# library archive path
-$config{MAX_IDENT}	  = "12";						# max ident size
-$config{MAX_QUIT}	   = "255";						# max quit message size
-$config{MAX_TOPIC}	  = "307";						# max topic size
-$config{MAX_KICK}	   = "255";						# max kick message size
-$config{MAX_GECOS}	  = "128";						# max GECOS size
-$config{MAX_AWAY}	   = "200";						# max AWAY size
+chomp($config{GCCVER}		= `$exec`);				# Major GCC Version
+$config{MAKEORDER}		= "ircd mods";				# build order
+$config{STATICLIBS}		= "";					# library archive path
+$config{MAX_IDENT}		= "12";					# max ident size
+$config{MAX_QUIT}		= "255";				# max quit message size
+$config{MAX_TOPIC}		= "307";				# max topic size
+$config{MAX_KICK}		= "255";				# max kick message size
+$config{MAX_GECOS}		= "128";				# max GECOS size
+$config{MAX_AWAY}		= "200";				# max AWAY size
+$config{MAXBUF}			= "512";				# Max buffer size
 if (defined $opt_ident)
 {
 	$config{MAX_IDENT} = $opt_ident;
@@ -703,11 +707,10 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the Private Key may take some time, go grab a  *
 * Coffee. Even better, to generate some more entropy if it  *
 * is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the	*
+* few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-			system("certtool --generate-privkey --outfile key.pem");
-			system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
+			make_gnutls_cert();
 			print "\nCertificate generation complete, copying to config directory... ";
 			system("mv key.pem $config{CONFIG_DIR}/key.pem");
 			system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -742,10 +745,9 @@ if ($config{USE_GNUTLS} eq "y") {
 			print "SSL Certificates Not found, Generating.. \n\n
 *************************************************************
 * Generating the certificates may take some time, go grab a *
-* coffee, or something.				     *
+* coffee, or something.                                     *
 *************************************************************\n\n";
-			system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
-			system("openssl dhparam -out dhparams.pem 1024");
+			make_openssl_cert();
 			print "\nCertificate generation complete, copying to config directory... ";
 			system("mv key.pem $config{CONFIG_DIR}/key.pem");
 			system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -963,6 +965,10 @@ sub writefiles {
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
 
+/* this is for windows support. */
+#define CoreExport /**/
+#define DllExport /**/
+
 #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define VERSION "$version"
@@ -983,8 +989,9 @@ sub writefiles {
 #define OPTIMISATION $config{OPTIMITEMP}
 #define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
-#define MAXBUF 514
 EOF
+print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
+
 		if ($config{OSNAME} =~ /SunOS/i) {
 			print FILEHANDLE "#define IS_SOLARIS\n";
 		}