Run modulemanager upgrade to check for updates to third party (and extras) modules...

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index df9e398ec78a65bb9737e9cd103b312700d1714d..1a4f03330f3d07c87208612ee276e7ebb0922135 100755 (executable)
--- 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
@@ -912,9 +917,8 @@ if ($config{USE_OPENSSL} eq "y") {
                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