X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=a29f2d5fdba0a39e194ba3a33a257830cfa274da;hb=75f147a25e8ecd30ada36c4b0a60c1b8c0e0717f;hp=4f91f8d2639c1befb21c996024114c7e24c2181d;hpb=65acd261de982afb7918368b4499756c3508b444;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 4f91f8d26..a29f2d5fd 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 ###################################################
 # InspIRCd Configuration Script
 #
-# Copyright 2002-2008 The InspIRCd Development Team
+# Copyright 2002-2009 The InspIRCd Development Team
 #  http://www.inspircd.org/wiki/index.php/Credits
 #
 # Licensed under GPL, please see the COPYING file
@@ -81,7 +81,7 @@ our %specialdeps = ();
 # If you wish for a file to have extra make lines (in between the compile and link steps)
 # then insert them here.
 # Auto populated by /* $ExtraBuild: */ instruction
-        
+
 our %extrabuildlines = ();
 
 # If you wish for a file to be linked against extra objects or arctives, insert them here.
@@ -144,6 +144,8 @@ GetOptions (
 	'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing.
 	'enable-extras=s@' => \@opt_enableextras, # ^
 	'disable-extras=s@' => \@opt_disableextras, # ^
+	'generate-openssl-cert' => sub { make_openssl_cert(); exit(0); },
+	'generate-gnutls-cert' => sub { make_gnutls_cert(); exit(0); }
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
@@ -663,7 +665,7 @@ print "yes\n" if $has_ports == 1;
 print "no\n" if $has_ports == 0;
 
 $config{HAS_EPOLL} = $has_epoll;
-$config{HAS_KQUEUE} = $has_kqueue; 
+$config{HAS_KQUEUE} = $has_kqueue;
 
 printf "Checking for libgnutls... ";
 if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
@@ -1061,8 +1063,8 @@ sub dir_check {
 			# Assume relative Path was given.. fill in the rest.
 			$var = $this . "/$var";
 		}
-		
-		$var = resolve_directory($var); 
+
+		$var = resolve_directory($var);
 		if (! -e $var) {
 			print "$var does not exist. Create it?\n[\e[1;32my\e[0m] ";
 			chomp(my $tmp = <STDIN>);
@@ -1154,7 +1156,7 @@ sub getosflags {
 		$config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread";
 		return "Solaris";
 	}
-	
+
 	if($config{OSNAME} =~ /MINGW32/i)
 	{
 		# All code is position-independent on windows
@@ -1379,7 +1381,7 @@ sub write_dynamic_modules_makefile {
 ###
 	print FILEHANDLE <<EOF;
 ###################################################
-# Copyright 2002-2007 The InspIRCd Development Team
+# Copyright 2002-2009 The InspIRCd Development Team
 #  http://www.inspircd.org/wiki/index.php/Credits
 #
 # Thanks to Andrew Church <achurch\@achurch.org>
@@ -1422,9 +1424,9 @@ EOCHEESE
 		$cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
 		$liflags = getlinkerflags("src/modules/m_".$i.".cpp");
 		my $deps = getdependencies("src/modules/m_".$i.".cpp");
-	
+
 		#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
-	
+
 
 		if (nopedantic("src/modules/m_".$i.".cpp"))
 		{
@@ -1442,7 +1444,7 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
 		}
 		$install_list = $install_list . "	install -m \$(INSTMODE) src/modules/m_$i.so \$(MODPATH)\n";
 		$uninstall_list = $uninstall_list . "	-rm \$(MODULES)/m_$i.so\n";
-###
+		###
 		# End Write Entry to the MakeFile
 		###
 	}
@@ -1458,7 +1460,7 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
 			if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) {
 				read_module_directory("src/modules/$name", $name);
 				print "Composing Makefile rules for directory \e[1;32m$name\e[0m... (\e[1;32m$mfcount files found\e[0m)\n";
-				print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n"; 
+				print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n";
 				print FILEHANDLE "	\@../../make/run-cc.pl \$(CC) -pipe \$(FLAGS) $SHARED $mliflags -o $name.so $mobjs\n";
 				print FILEHANDLE "\n$mfrules\n";
 				closedir(MDIRHANDLE);
@@ -1471,11 +1473,11 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
 
 sub read_module_directory {
 	my ($dpath, $reldpath) = @_;
-	
+
 	if (opendir(MDIRHANDLE, $dpath) == 0) {
 		return;
 	}
-	
+
 	foreach my $fname (sort readdir(MDIRHANDLE)) {
 		if ($fname =~ /\.cpp$/) {
 			my $cmflags = getcompilerflags("$dpath/$fname");