Add server ports to ServerInstance->ports, enable SSL on them using OnHookIO

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

diff --git a/make/configure.pm b/make/configure.pm
index 05db6004e75b8864cdd1ceceb4f70115a51b1c6c..7696acb8531a6afcec4a6201233db209726b0ed5 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -20,7 +20,7 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies getmodversion nopedantic resolve_directory yesno showhelp promptstring_s);
+our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s);
 
 my $no_svn = 0;
 
@@ -122,21 +122,6 @@ sub getdependencies {
        return "";
 }
 
-sub getmodversion {
-       my ($file) = @_;
-       open(FLAGS, $file) or return "";
-       while (<FLAGS>) {
-               if (m#(?:^/* \$|")ModVersion: (\S+)(?: \*\/$|")#) {
-                       my $x = translate_functions($1, $file);
-                       next if ($x eq "");
-                       close(FLAGS);
-                       return $x;
-               }
-       }
-       close(FLAGS);
-       return "";
-}
-
 sub nopedantic {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
@@ -226,11 +211,9 @@ sub dumphash()
        print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
        print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
        print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
-       print "\e[0mLibrary path:\e[1;32m\t\t\t$main::config{LIBRARY_DIR}\e[0m\n";
        print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.$main::config{GCCMINOR}\e[0m\n";
        print "\e[0mCompiler program:\e[1;32m\t\t$main::config{CC}\e[0m\n";
        print "\e[0mIPv6 Support:\e[1;32m\t\t\t$main::config{IPV6}\e[0m\n";
-       print "\e[0mIPv6 to IPv4 Links:\e[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\e[0m\n";
        print "\e[0mGnuTLS Support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
        print "\e[0mOpenSSL Support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n\n";
        print "\e[1;32mImportant note: The maximum length values are now configured in the\e[0m\n";
@@ -274,7 +257,7 @@ is started, and any omitted values are defaulted.
 Arguments with a single \"-\" symbol, as in
 InspIRCd 1.0.x, are also allowed.
 
-  --disable-interactive        Sets no options intself, but
+  --disable-interactive        Sets no options itself, but
                                will disable any interactive prompting.
   --disable-rpath              Disable runtime paths. DO NOT USE UNLESS
                                YOU KNOW WHAT YOU ARE DOING!
@@ -293,10 +276,7 @@ InspIRCd 1.0.x, are also allowed.
                                to select() [not set]
   --disable-kqueue             Do not enable kqueue(), fall back
                                to select() [not set]
-  --enable-ipv6                Build ipv6 native InspIRCd [no]
-  --enable-remote-ipv6         Build with ipv6 support for remote
-                               servers on the network [yes]
-  --disable-remote-ipv6        Do not allow remote ipv6 servers [not set]
+  --disable-ipv6               Do not build ipv6 native InspIRCd [not set]
   --with-cc=[filename]         Use an alternative g++ binary to
                                build InspIRCd [g++]
   --with-maxbuf=[n]            Change the per message buffer size [512]