X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=1a4f03330f3d07c87208612ee276e7ebb0922135;hb=26e8190a3775bea8a3ef1b2c89184043394ea341;hp=a037ca00b49dd17b8eb8c01133e6a3e6725a123d;hpb=746f63b2feb4646977ae29f53fb54b0d1e7a85ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index a037ca00b..1a4f03330 100755
--- a/configure
+++ b/configure
@@ -677,6 +677,9 @@ else
 	print "no ($config{OSNAME})\n";
 }
 
+print "Checking for upgrades to extra and third party modules... ";
+system "./modulemanager upgrade";
+
 ################################################################################
 #			  BEGIN INTERACTIVE PART			      #
 ################################################################################
@@ -870,13 +873,15 @@ if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
 }
 our $failed = 0;
 
+$config{CERTGEN} ||= 'y';
+yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
+
 if ($config{USE_GNUTLS} eq "y") {
 	unless (-r "src/modules/m_ssl_gnutls.cpp") {
 		print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
 		symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!";
 	}
-	getmodules();
-	if ($interactive)
+	if ($interactive && $config{CERTGEN} eq 'y')
 	{
 		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
 			print "SSL Certificates Not found, Generating.. \n\n
@@ -905,14 +910,15 @@ if ($config{USE_GNUTLS} eq "y") {
 	{
 		print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
 	}
-} elsif ($config{USE_OPENSSL} eq "y") {
+}
+
+if ($config{USE_OPENSSL} eq "y") {
 	unless (-r "src/modules/m_ssl_openssl.cpp") {
 		print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
 		symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!";
 	}
-	getmodules();
 	$failed = 0;
-	if ($interactive)
+	if ($interactive && $config{CERTGEN} eq 'y')
 	{
 		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
 			print "SSL Certificates Not found, Generating.. \n\n
@@ -1250,7 +1256,7 @@ EOF
 			if (defined(opendir(MDIRHANDLE, "src/modules/$name2"))) {
 				closedir(MDIRHANDLE);
 				$modules .= "$name2.so ";
-				$uninstall_list = $uninstall_list . "	-rm \$(MODULES)/$name2.so\n";
+				$uninstall_list = $uninstall_list . "	-rm \$(MODPATH)/$name2.so\n";
 			}
 		}
 	}
@@ -1722,7 +1728,7 @@ EOM
 commands:
 	@${MAKE} -C commands $(MAKEARGS) commands
 
-modes/modeclasses.a: $(RELCPPFILES)
+modes/modeclasses.a: $(RELCPPFILES) ../include/inspircd.h ../include/inspircd_config.h
 	@${MAKE} -C modes $(MAKEARGS) CPPFILES="$(CPPFILES)" modeclasses.a
 
 EOM