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 bf6ffb7c624302b7b5d9fc1d36ae09fd615444fd..1a4f03330f3d07c87208612ee276e7ebb0922135 100755 (executable)
--- a/configure
+++ b/configure
@@ -218,7 +218,7 @@ 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_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
 
 if (defined $opt_freebsd_port)
 {
@@ -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";
                        }
                }
        }
@@ -1288,34 +1294,49 @@ EOF
                        next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist"));
 
                        # All .name.inc files need parsing!
-                       $tmp = "";
                        open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc");
-                       while (<FILEHANDLE>) {
-                               $tmp .= $_;
-                       }
+                       $_ = join '', <FILEHANDLE>;
                        close(FILEHANDLE);
 
                        print "Writing \e[1;32m$file\e[0m ...\n";
-                       $tmp =~ s/\@CC\@/$config{CC}/ if defined $config{CC};
-                       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/ if defined $config{FLAGS};
-                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/ if defined $config{DEVELOPER};
-                       $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/ if defined $config{LDLIBS};
-                       $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/ if defined $config{BASE_DIR};
-                       $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/ if defined $config{CONFIG_DIR};
-                       $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/ if defined $config{MODULE_DIR};
-                       $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/ if defined $config{BINARY_DIR};
-                       $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/ if defined $config{LIBRARY_DIR};
-                       $tmp =~ s/\@MODULES\@/$modules/ if defined $modules;
-                       $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/ if defined $config{STARTSCRIPT};
-                       $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/ if defined $config{DESTINATION};
-                       $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/ if defined $config{EXTRA_DIR};
-                       $tmp =~ s/\@EXECUTABLE\@/$exe/ if defined $exe;
-                       $tmp =~ s/\@VERSION\@/$version/ if defined $version;
-                       $tmp =~ s/\@INSTALL_LIST\@/$install_list/ if defined $install_list;
-                       $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list;
-
-                       open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n");
-                       print FILEHANDLE $tmp;
+                       for my $var (qw(
+                               CC FLAGS DEVELOPER LDLIBS BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR LIBRARY_DIR
+                               STARTSCRIPT DESTINATION EXTRA_DIR
+                       )) {
+                               s/\@$var\@/$config{$var}/g;
+                       }
+                       s/\@MODULES\@/$modules/ if defined $modules;
+                       s/\@EXECUTABLE\@/$exe/ if defined $exe;
+                       s/\@VERSION\@/$version/ if defined $version;
+                       s/\@INSTALL_LIST\@/$install_list/ if defined $install_list;
+                       s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list;
+
+                       if ($file eq 'Makefile') {
+                               my $mk_tmp = $_;
+                               s/\@IFDEF (\S+)/ifdef $1/g;
+                               s/\@IFNDEF (\S+)/ifndef $1/g;
+                               s/\@ELSE/else/g;
+                               s/\@ENDIF/endif/g;
+                               s/\@BSD_ONLY .*\n//g;
+                               s/\@GNU_ONLY //g;
+                               open MKF, '>GNUmakefile' or die "Can't write to GNUmakefile: $!";
+                               print MKF $_;
+                               close MKF;
+                               $_ = $mk_tmp;
+                               s/\@IFDEF (\S+)/.if defined($1)/g;
+                               s/\@IFNDEF (\S+)/.if !defined($1)/g;
+                               s/\@ELSE/.else/g;
+                               s/\@ENDIF/.endif/g;
+                               s/\@BSD_ONLY //g;
+                               s/\@GNU_ONLY .*\n//g;
+                               open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!";
+                               print MKF $_;
+                               close MKF;
+                       } else {
+                               open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n");
+                               print FILEHANDLE $_;
+                               close(FILEHANDLE);
+                       }
                }
        }
        closedir(DIRHANDLE);
@@ -1707,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