]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
m_bcrypt: Add module
[user/henk/code/inspircd.git] / configure
index 16af52d0ec5789d9b3354e97653eb35b2407baa4..45bb0e911f68f65d20bab8b39ebbe6f513a52880 100755 (executable)
--- a/configure
+++ b/configure
-#!/usr/bin/perl
-###################################################
-# InspIRCd Configuration Script
+#!/usr/bin/env perl
+
 #
-# Copyright 2002-2007 The InspIRCd Development Team
-#  http://www.inspircd.org/wiki/index.php/Credits
+# InspIRCd -- Internet Relay Chat Daemon
 #
-# Licensed under GPL, please see the COPYING file
-# for more information
+#   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+#   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+#   Copyright (C) 2003, 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+#   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+#   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+#   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+#   Copyright (C) 2003-2006 Craig McLure <craig@chatspike.net>
 #
-# $Id$
+# This file is part of InspIRCd.  InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
 #
-###################################################
-
-require 5.8.0;
-use Socket;
-use Cwd;
-use Getopt::Long;
-
-# Utility functions for our buildsystem
-use make::utilities;
-use make::configure;
-use make::gnutlscert;
-use make::opensslcert;
-
-###############################################################################################
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
 #
-#                                   EDITABLE VARIABLES
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-###############################################################################################
-
-# If you wish to ignore a dependency throughout the entire core, add it here.
-
-my @ignoredeps = (
-       "inspircd_win32wrapper.h",      # windows has its own configure program
-);
 
-# If you wish for all files in the entire core to have a given dependency, insert it here.
-# You should keep this to an absolute minimum to avoid rebuilds that are not neccessary.
 
-my @immutabledeps = (
-       "inspircd_config.h",            # auto re-generated by configure
-       "inspircd.h",
-);
-
-###############################################################################################
-#
-#                                 NON-EDITABLE VARIABLES
-#
-###############################################################################################
-
-# List of commands that make up 'make install' and 'make deinstall'
-
-my $install_list = "";
-my $uninstall_list = "";
-
-# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
-# whos file extension is omitted (these can vary from system to system). Auto detected by
-# scanning the src/*.cpp files for files containing /* $Core: */ identifiers.
-
-my %filelist = ();
+BEGIN {
+       require 5.8.0;
+}
 
-# If you wish for a file to have special dependencies in the makefile, add an entry here.
-# Auto populated by /* $ExtraDeps: */ instruction
+use strict;
+use warnings FATAL => qw(all);
 
-my %specialdeps = ();
+use File::Copy ();
+use File::Spec::Functions qw(rel2abs);
+use Cwd;
+use Getopt::Long;
 
-# 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
-        
-my %extrabuildlines = ();
+use make::configure;
+use make::utilities;
 
-# If you wish for a file to be linked against extra objects or arctives, insert them here.
-# Auto populated by /* $ExtraObjects: */ instruction
+our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_socketengine,
+     $opt_system, $opt_uid, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir,
+     $opt_data_dir, $opt_log_dir);
 
-my %extraobjects = ();
+sub list_extras ();
 
-# If you wish to compile extra cpp sources into an object, define them here.
-# NOTE: Certain cpp files such as the socket engines have a value auto calculated
-# for this table so that their derived class is built.
-# Auto populated by /* $ExtraSources: */ instruction
+sub enable_extras (@);
 
-my %extrasources = ();
+sub disable_extras (@);
 
+my @opt_enableextras;
+my @opt_disableextras;
 
 GetOptions (
        'enable-gnutls' => \$opt_use_gnutls,
-       'rebuild' => \$opt_rebuild,
+       'system' => \$opt_system,
+       'uid=s' => \$opt_uid,
        'enable-openssl' => \$opt_use_openssl,
        'disable-interactive' => \$opt_nointeractive,
-       'with-nick-length=i' => \$opt_nick_length,
-       'with-channel-length=i' => \$opt_chan_length,
-       'with-max-clients=i' => \$opt_maxclients,
-       'enable-ports' => \$opt_ports,
-       'enable-epoll' => \$opt_epoll,
-       'enable-kqueue' => \$opt_kqueue,
-       'disable-ports' => \$opt_noports,
-       'disable-epoll' => \$opt_noepoll,
-       'disable-kqueue' => \$opt_nokqueue,
-       'disable-rpath' => \$opt_disablerpath,
-       'enable-ipv6' => \$opt_ipv6,
-       'enable-remote-ipv6' => \$opt_ipv6links,
-       'disable-remote-ipv6' => \$opt_noipv6links,
-       'with-cc=s' => \$opt_cc,
-       'with-ident-length=i' => \$opt_ident,
-       'with-quit-length=i' => \$opt_quit,
-       'with-topic-length=i' => \$opt_topic,
-       'with-maxbuf=i' => \$opt_maxbuf,
-       'with-kick-length=i' => \$opt_kick,
-       'with-gecos-length=i' => \$opt_gecos,
-       'with-away-length=i' => \$opt_away,
-       'with-max-modes=i' => \$opt_modes,
+       'socketengine=s' => \$opt_socketengine,
        'prefix=s' => \$opt_base_dir,
        'config-dir=s' => \$opt_config_dir,
        'module-dir=s' => \$opt_module_dir,
        'binary-dir=s' => \$opt_binary_dir,
-       'library-dir=s' => \$opt_library_dir,
-       'disable-debuginfo' => sub { $opt_disable_debug = 1 },
-       'help'  => sub { showhelp(); },
-       'modupdate' => sub { modupdate(); },
-       'update' => sub { update(); },
-       'svnupdate' => sub { svnupdate(); },
-       'clean' => sub { clean(); },
+       'data-dir=s' => \$opt_data_dir,
+       'log-dir=s' => \$opt_log_dir,
+       'help'  => \&cmd_help,
+       'update' => \&cmd_update,
+       'clean' => \&cmd_clean,
+       '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, # ^
 );
 
-my $non_interactive = (
-       (defined $opt_library_dir) ||
+if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
+       @opt_enableextras = split /,/, join(',', @opt_enableextras);
+       @opt_disableextras = split /,/, join(',', @opt_disableextras);
+       enable_extras(@opt_enableextras);
+       disable_extras(@opt_disableextras);
+       list_extras;
+       print "Remember: YOU are responsible for making sure any libraries needed have been installed!\n";
+       exit 0;
+}
+
+our $interactive = !(
        (defined $opt_base_dir) ||
        (defined $opt_config_dir) ||
        (defined $opt_module_dir) ||
        (defined $opt_base_dir) ||
        (defined $opt_binary_dir) ||
+       (defined $opt_data_dir) ||
+       (defined $opt_log_dir) ||
        (defined $opt_nointeractive) ||
-       (defined $opt_away) ||
-       (defined $opt_gecos) ||
-       (defined $opt_kick) ||
-       (defined $opt_maxclients) ||
-       (defined $opt_modes) ||
-       (defined $opt_topic) ||
-       (defined $opt_quit) ||
-       (defined $opt_ident) ||
-       (defined $opt_cc) ||
-       (defined $opt_ipv6) ||
-       (defined $opt_ipv6links) ||
-       (defined $opt_noipv6links) ||
-       (defined $opt_kqueue) ||
-       (defined $opt_epoll) ||
-       (defined $opt_ports) ||
-       (defined $opt_maxchans) ||
-       (defined $opt_opermaxchans) ||
-       (defined $opt_chan_length) ||
-       (defined $opt_nick_length) ||
+       (defined $opt_socketengine) ||
        (defined $opt_use_openssl) ||
-       (defined $opt_nokqueue) ||
-       (defined $opt_noepoll) ||
-       (defined $opt_noports) ||
-       (defined $opt_maxbuf) ||
+       (defined $opt_system) ||
+       (defined $opt_uid) ||
        (defined $opt_use_gnutls)
 );
-my $interactive = !$non_interactive;
 
+our %config = read_configure_cache();
 
-chomp($topdir = getcwd());
-$this = resolve_directory($topdir);                                            # PWD, Regardless.
-@modlist = ();                                                                 # Declare for Module List..
-%config = ();                                                                  # Initiate Configuration Hash..
-$config{ME}             = resolve_directory($topdir);                          # Present Working Directory
+print "Checking for cache from previous configure... ";
+print %config ? "found\n" : "not found\n";
 
-$config{BASE_DIR}         = $config{ME};
+$config{BASE_DIR} = getcwd()."/run";
 
-if (defined $opt_base_dir)
-{
+if (defined $opt_base_dir) {
        $config{BASE_DIR} = $opt_base_dir;
+} elsif (defined $opt_system) {
+       $config{BASE_DIR} = '/var/lib/inspircd';
 }
 
-$config{CONFIG_DIR}     = resolve_directory($config{BASE_DIR}."/conf");        # Configuration Directory
-$config{MODULE_DIR}     = resolve_directory($config{BASE_DIR}."/modules");     # Modules Directory
-$config{BINARY_DIR}     = resolve_directory($config{BASE_DIR}."/bin");         # Binary Directory
-$config{LIBRARY_DIR}   = resolve_directory($config{BASE_DIR}."/lib");          # Library Directory
+if (defined $opt_system) {
+       $config{UID} = defined $opt_uid ? $opt_uid : 'ircd';
+       $config{CONFIG_DIR} = '/etc/inspircd';
+       $config{MODULE_DIR} = '/usr/lib/inspircd';
+       $config{BINARY_DIR} = '/usr/sbin/';
+       $config{DATA_DIR} = '/var/inspircd';
+       $config{LOG_DIR} = '/var/log/inspircd';
+} else {
+       $config{UID} = defined $opt_uid ? $opt_uid : $<;
+       $config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
+       $config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
+       $config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
+       $config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
+       $config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
+}
 
-if (defined $opt_config_dir)
-{
+if (defined $opt_config_dir) {
        $config{CONFIG_DIR} = $opt_config_dir;
 }
-if (defined $opt_module_dir)
-{
+if (defined $opt_module_dir) {
        $config{MODULE_DIR} = $opt_module_dir;
 }
-if (defined $opt_binary_dir)
-{
+if (defined $opt_binary_dir) {
        $config{BINARY_DIR} = $opt_binary_dir;
 }
-if (defined $opt_library_dir)
-{
-       $config{LIBRARY_DIR} = $opt_library_dir;
+if (defined $opt_data_dir) {
+       $config{DATA_DIR} = $opt_data_dir;
 }
-chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);          # Openssl version
-chomp($gnutls_ver = $config{HAS_GNUTLS});
-chomp($openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS}        = "n";
+if (defined $opt_log_dir) {
+       $config{LOG_DIR} = $opt_log_dir;
+}
+chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null`);
+chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);
+
+chomp(our $gnutls_ver = $config{HAS_GNUTLS});
+chomp(our $openssl_ver = $config{HAS_OPENSSL});
+$config{USE_GNUTLS}        = 0;
 if (defined $opt_use_gnutls)
 {
        $config{USE_GNUTLS} = "y";                                      # Use gnutls.
 }
-$config{USE_OPENSSL}   = "n";                                          # Use openssl.
+$config{USE_OPENSSL}   = 0;                                            # Use openssl.
 if (defined $opt_use_openssl)
 {
        $config{USE_OPENSSL} = "y";
 }
 
-# no, let's not change these.
-$config{OPTIMITEMP}     = "0";                                         # Default Optimisation Value
-if (!defined $opt_disable_debug)
-{
-       $config{OPTIMISATI}      = "-g1";                               # Optimisation Flag
-}
-else
-{
-       $config{OPTIMISATI}      = "-O2";                               # DEBUGGING OFF!
+$config{CXX} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler();
+if ($config{CXX} eq "") {
+       print "A C++ compiler could not be detected on your system!\n";
+       print "Set the CXX environment variable to the full path if this is incorrect.\n";
+       exit 1; 
 }
 
-$config{NICK_LENGT}     = "31";                                        # Default Nick Length
-if (defined $opt_nick_length)
-{
-       $config{NICK_LENGT} = $opt_nick_length;
-}
-$config{CHAN_LENGT}     = "64";                                        # Default Channel Name Length
-if (defined $opt_chan_length)
-{
-       $config{CHAN_LENGT} = $opt_chan_length;
-}
-$config{MAXI_MODES}     = "20";                                        # Default Max. Number of Modes set at once.
-if (defined $opt_modes)
-{
-       $config{MAXI_MODES} = $opt_modes;
-}
-$config{HAS_STRLCPY}   = "false";                                      # strlcpy Check.
-$config{HAS_STDINT}     = "false";                                     # stdint.h check
-$config{USE_KQUEUE}     = "y";                                         # kqueue enabled
-if (defined $opt_kqueue)
-{
-       $config{USE_KQUEUE} = "y";
-}
-if (defined $opt_nokqueue)
-{
-       $config{USE_KQUEUE} = "n";
-}
-$config{USE_EPOLL}       = "y";                                        # epoll enabled
-if (defined $opt_epoll)
-{
-       $config{USE_EPOLL} = "y";
-}
-if (defined $opt_noepoll)
-{
-       $config{USE_EPOLL} = "n";
-}
-$config{USE_PORTS}       = "y";                                        # epoll enabled
-if (defined $opt_ports)
-{
-       $config{USE_PORTS} = "y";
-}
-if (defined $opt_noports)
-{
-       $config{USE_PORTS} = "n";
-}
-$config{IPV6}         = "n";                                           # IPv6 support (experimental)
-if (defined $opt_ipv6)
-{
-       $config{IPV6} = "y";
-}
-$config{SUPPORT_IP6LINKS}   = "y";                                     # IPv4 supporting IPv6 links (experimental)
-if (defined $opt_ipv6links)
-{
-       $config{SUPPORT_IP6LINKS} = "y";
-}
-if (defined $opt_noipv6links)
-{
-       $config{SUPPORT_IP6LINKS} = "n";
-}
-chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                  # FD Limit
-chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);               # Hard FD Limit
-chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);          # Major GCC Version
-$config{_SOMAXCONN} = SOMAXCONN;                                       # Max connections in accept queue
-$config{OSNAME}            = $^O;                                      # Operating System Name
-$config{IS_DARWIN}       = "NO";                                       # Is OSX?
-$config{STARTSCRIPT}     = "inspircd";                 # start script?
-$config{DESTINATION}     = "BASE";                             # Is target path.
-$config{EXTRA_DIR}       = "";                                         # Is empty.
-if ($config{OSNAME} =~ /darwin/i)
-{
-       $config{IS_DARWIN} = "YES";
-       $config{STARTSCRIPT}      = "org.inspircd.plist";               # start script for OSX.
-       $config{DESTINATION}      = "LAUNCHDPATH";                              # Is OSX target.
-       $config{EXTRA_DIR}          = " launchd_dir";                           # Is OSX specific path.
-}
-$config{CC}                = "g++";                                            # C++ compiler
-if (defined $opt_cc)
-{
-       $config{CC} = $opt_cc;
-}
-$exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}          = `$exec`);                             # Major GCC Version
-$config{MAKEORDER}             = "ircd mods";                          # build order
-$config{MAX_IDENT}             = "12";                                 # max ident size
-$config{MAX_QUIT}              = "255";                                # max quit message size
-$config{MAX_TOPIC}             = "307";                                # max topic size
-$config{MAX_KICK}              = "255";                                # max kick message size
-$config{MAX_GECOS}             = "128";                                # max GECOS size
-$config{MAX_AWAY}              = "200";                                # max AWAY size
-$config{MAXBUF}                        = "512";                                # Max buffer size
-if (defined $opt_ident)
-{
-       $config{MAX_IDENT} = $opt_ident;
-}
-if (defined $opt_quit)
-{
-       $config{MAX_QUIT} = $opt_quit;
-}
-if (defined $opt_topic)
-{
-       $config{MAX_TOPIC} = $opt_topic;
-}
-if (defined $opt_kick)
-{
-       $config{MAX_KICK} = $opt_kick;
-}
-if (defined $opt_gecos)
-{
-       $config{MAX_GECOS} = $opt_gecos;
-}
-if (defined $opt_away)
-{
-       $config{MAX_AWAY} = $opt_away;
-}
-
-$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
-$config{HAS_OPENSSL} = $1;
-
-if ($config{GCCVER} eq "") {
-       print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
-       exit;
+our %cxx = get_compiler_info($config{CXX});
+if ($cxx{UNSUPPORTED}) {
+       print "Your C++ compiler is too old to build InspIRCd!\n";
+       print "Reason: $cxx{REASON}\n";
+       exit 1;
 }
 
-if (!$config{MAX_CLIENT_T}) { 
-       $config{MAX_CLIENT_T} = 1024;                            # Set a reasonable 'Default'
-       $fd_scan_fail = "true";                                # Used Later
-}
-
-# Get and Set some important vars..
-getmodules();
-
-sub clean
-{
-       unlink(".config.cache");
-}
-
-sub update
-{
-       eval {
-               chomp($topdir = getcwd());
-               $this = resolve_directory($topdir);                                          # PWD, Regardless.
-               getmodules();
-               # Does the cache file exist?
-               if (!getcache()) {
-                       # No, No it doesn't.. *BASH*
-                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-                       exit 0;
-               } else {
-                       # We've Loaded the cache file and all our variables..
-                       print "Updating files...\n";
-                       getosflags();
-                       if ($opt_disable_debug == 1)
-                       {
-                               print "Disabling debug information (-g).\n";
-                               $config{OPTIMISATI} = "";
-                               getosflags();
-                       }
-                       $has_epoll = $config{HAS_EPOLL};
-                       $has_ports = $config{HAS_PORTS};
-                       $has_kqueue = $config{HAS_KQUEUE};
-                       writefiles(1);
-                       makecache();
-                       print "Complete.\n";
-                       exit;
-               }
-       };
-       if ($@)
-       {
-               print "Configure update failed: $@\n";
-       }
-       exit;
-}
-
-sub modupdate
-{
-       eval {
-               chomp($topdir = getcwd());
-               $this = resolve_directory($topdir);                                          # PWD, Regardless.
-               getmodules();
-               # Does the cache file exist?
-               if (!getcache()) {
-                       # No, No it doesn't.. *BASH*
-                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-                       exit 0;
-               } else {
-                       # We've Loaded the cache file and all our variables..
-                       print "Updating files...\n";
-                       getosflags();
-                       $has_epoll = $config{HAS_EPOLL};
-                       $has_ports = $config{HAS_PORTS};
-                       $has_kqueue = $config{HAS_KQUEUE};
-                       writefiles(0);
-                       makecache();
-                       print "Complete.\n";
-                       exit;
-               }
-       };
-       if ($@)
-       {
-               print "Module update failed: $@\n";
-       }
-       exit;
-}
-
-
-
-sub svnupdate
-{
-       my $fail = 0;
-       open(FH,"<.svn/entries") or $fail = 1;
-       if ($fail) {
-               print "This is not an SVN copy of InspIRCd.\n";
-               exit;
-       }
-       else
-       {
-               close(FH);
-       }
-       system("svn update");
-       system("perl configure -update");
-       if (defined $opt_rebuild) {
-               system("make install");
-       }
-       exit;
+if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
+       $config{HAS_OPENSSL} = $1;
+} else {
+       $config{HAS_OPENSSL} = "";
 }
 
-print "Running non-interactive configure...\n" unless $interactive;
-print "Checking for cache from previous configure... ";
-print ((!getcache()) ? "not found\n" : "found\n");
-print "Checking operating system version... ";
-print getosflags() . "\n";
+$config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', '-lrt');
+$config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');
 
-if (defined $opt_maxclients)
-{
-       $config{MAX_CLIENT} = $opt_maxclients;
+if ($config{HAS_EPOLL} = run_test 'epoll', test_header($config{CXX}, 'sys/epoll.h')) {
+       $config{SOCKETENGINE} ||= 'epoll';
 }
 
-if (!$config{MAX_CLIENT}) { 
-       # If the cache hasn't set the max clients, copy the variable of MAX_CLIENT_T, this
-       # allows us to keep _T for testing purposes. (ie. "Are you sure you want to go
-       # higher than the found value" :))
-       $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
+if ($config{HAS_KQUEUE} = run_test 'kqueue', test_file($config{CXX}, 'kqueue.cpp')) {
+       $config{SOCKETENGINE} ||= 'kqueue';
 }
 
-printf "Checking if stdint.h exists... ";
-$config{HAS_STDINT} = "true";
-my $fail = 0;
-open(STDINT, "</usr/include/stdint.h") or $config{HAS_STDINT} = "false";
-if ($config{HAS_STDINT} eq "true") {
-       close(STDINT);
+if ($config{HAS_PORTS} = run_test 'Solaris IOCP', test_header($config{CXX}, 'port.h')) {
+       $config{SOCKETENGINE} ||= 'ports';
 }
-print "yes\n" if $config{HAS_STDINT} eq "true";
-print "no\n" if $config{HAS_STDINT} eq "false";
 
-
-printf "Checking if strlcpy exists... ";
-# Perform the strlcpy() test..
-$config{HAS_STRLCPY} = "false";
-my $fail = 0;
-open(STRLCPY, "</usr/include/string.h") or $fail = 1;
-if (!$fail) {
-       while (chomp($line = <STRLCPY>)) {
-               # try and find the delcaration of:
-               # size_t strlcpy(...)
-               if ($line =~ /size_t(\0x9|\s)+strlcpy/) {
-                       $config{HAS_STRLCPY} = "true";
-               }
-       }
-       close(STRLCPY);
+if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) {
+       $config{SOCKETENGINE} ||= 'poll';
 }
-print "yes\n" if $config{HAS_STRLCPY} eq "true";
-print "no\n" if $config{HAS_STRLCPY} eq "false";
-
 
-printf "Checking if kqueue exists... ";
-$has_kqueue = 0;
-$fail = 0;
-open(KQUEUE, "</usr/include/sys/event.h") or $fail = 1;
-if (!$fail) {
-       while (chomp($line = <KQUEUE>)) {
-               # try and find the delcaration of:
-               # int kqueue(void);
-               if ($line =~ /int(\0x9|\s)+kqueue/) {
-                       $has_kqueue = 1;
-               }
-       }
-       close(KQUEUE);
-}
-print "yes\n" if $has_kqueue == 1;
-print "no\n" if $has_kqueue == 0;
+# Select is available on all platforms
+$config{HAS_SELECT} = 1;
+$config{SOCKETENGINE} ||= "select";
 
-printf "Checking if epoll exists... ";
-$has_epoll = 0;
-$fail = 0;
-open(EPOLL, "</usr/include/sys/epoll.h") or $fail = 1;
-if (!$fail) {
-       $has_epoll = 1;
-       close(EPOLL);
-}
-if ($has_epoll) {
-       my $kernel = `uname -r`;
-       chomp($kernel);
-       if (($kernel =~ /^2\.0\./) || ($kernel =~ /^2\.2\./) || ($kernel =~ /^2\.4\./)) {
-               $has_epoll = 0;
-       }
-       else
-       {
-               # Suggestion from nenolod, weed out odd systems which have glibc built
-               # against 2.4 kernels (ick)
-               my $kernel_arch = `uname -p`;
-               chomp($kernel_arch);
-               $libcv = 0.0;
-               $kernelv = 0.0;
-               if ($kernel_arch =~ /x86_64/) {
-                       open (FH,"/lib64/libc.so.6|") or $has_epoll = 0;
-               }
-               else {
-                       open (FH,"/lib/libc.so.6|") or $has_epoll = 0;
-               }
-               if ($has_epoll)
-               {
-                       while (chomp($line = <FH>))
-                       {
-                               if ($line =~ /GNU C Library .* version (.*?) /)
-                               {
-                                       $libcv = $1;
-                                       $libcv =~  /(\d+\.\d+)/;
-                                       $libcv = $1;
-                               }
-                               elsif ($line =~ /Compiled on a Linux (.*?\..*?)\.* system/)
-                               {
-                                       $kernelv = $1;
-                                       # Fix for some retarded libc builds, strip off >> and << etc.
-                                       $kernelv =~ /(\d+\.\d+)/;
-                                       $kernelv = $1;
-                               }
-                       }
-                       close FH;
-                       if ($libcv < 2.3)
-                       {
-                               $has_epoll = 0;
-                               printf "libc too old: $libcv... ";
-                       }
-                       if ($kernelv < 2.6)
-                       {
-                               $has_epoll = 0;
-                               printf "libc built against older kernel $kernelv... ";
-                       }
+if (defined $opt_socketengine) {
+       my $cfgkey = "HAS_" . uc $opt_socketengine;
+       if ($config{$cfgkey} && -f "src/socketengines/socketengine_$opt_socketengine.cpp") {
+               $config{SOCKETENGINE} = $opt_socketengine;
+       } else {
+               print "Unable to use a socket engine which is not supported on this platform ($opt_socketengine)!\n";
+               print "Available socket engines are:";
+               foreach (<src/socketengines/socketengine_*.cpp>) {
+                       s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
+                       print " $1" if $config{"HAS_" . uc $1};
                }
+               print "\n";     
+               exit 1;
        }
 }
-print "yes\n" if $has_epoll == 1;
-print "no\n" if $has_epoll == 0;
-
-printf "Checking if Solaris I/O completion ports are available... ";
-$has_ports = 0;
-my $system = `uname -s`;
-chomp ($system);
-$has_ports = 1 if ($system eq "SunOS");
 
-if ($has_ports) {
-       my $kernel = `uname -r`;
-       chomp($kernel);
-       if (($kernel !~ /^5\.1./)) {
-               $has_ports = 0;
+print "Checking for libgnutls... ";
+if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
+       if (defined($gnutls_ver) && ($gnutls_ver ne "")) {
+               print "yes\n";
+               $config{HAS_GNUTLS} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_GNUTLS} = "n";
        }
-}
-print "yes\n" if $has_ports == 1;
-print "no\n" if $has_ports == 0;
-
-$config{HAS_EPOLL} = $has_epoll;
-$config{HAS_KQUEUE} = $has_kqueue; 
-
-printf "Checking for libgnutls... ";
-if (($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS} >= 1.2) || ($config{HAS_GNUTLS} eq "y"))) {
-       print "yes\n";
-       $config{HAS_GNUTLS} = "y";
 } else {
        print "no\n";
        $config{HAS_GNUTLS} = "n";
 }
 
-printf "Checking for openssl... ";
-if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPENSSL} eq "y"))) {
-       print "yes\n";
-       $config{HAS_OPENSSL} = "y";
+print "Checking for openssl... ";
+if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
+       if (defined($openssl_ver) && ($openssl_ver ne "")) {
+               print "yes\n";
+               $config{HAS_OPENSSL} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_OPENSSL} = "n";
+       }
 } else {
        print "no\n";
        $config{HAS_OPENSSL} = "n";
 }
 
-printf "Checking if you are running an ancient, unsupported OS... ";
-if ($config{OSNAME} =~ /FreeBSD/i)
-{
-       $version = `uname -r`;
-       if ($version =~ /^4\./)
-       {
-               $foundit = `ls -l /usr/local/lib/libgnugetopt* | wc -l`;
-               if ($foundit > 0)
-               {
-                       # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE!
-                       $config{CRAQ} = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1";
-                       print "yes\n";
-               }
-               else
-               {
-                       print "\n\nERROR: You require libgnugetopt (from ports or packages) to build InspIRCd on FreeBSD 4.11.\n";
-               }
-       }
-       else
-       {
-               $config{CRAQ} = " ";
-               print "no ($version)\n";
-       }
-}
-else
-{
-       $config{CRAQ} = " ";
-       print "no ($config{OSNAME})\n";
-}
-
-################################################################################
-#                        BEGIN INTERACTIVE PART                              #
-################################################################################
-
-# Clear the Screen..
 if ($interactive)
 {
-       system("clear");
-       $wholeos = $^O;
+       # Clear the screen.
+       system 'tput', 'clear';
+
+       my %version = get_version();
 
-       my $rev = getrevision();
        # Display Introduction Message..
-       print "
-Welcome to the \033[1mInspIRCd\033[0m Configuration program! (\033[1minteractive mode\033[0m)
-\033[1mPackage maintainers: Type ./configure --help for non-interactive help\033[0m
+       print <<"STOP" ;
+Welcome to the \e[1mInspIRCd\e[0m configuration program! (\e[1minteractive mode\e[0m)
+\e[1mPackage maintainers: Type ./configure --help for non-interactive help\e[0m
 
 *** If you are unsure of any of these values, leave it blank for    ***
 *** standard settings that will work, and your server will run      ***
 *** using them. Please consult your IRC network admin if in doubt.  ***
 
-Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter
-a new value. Please note: You will \033[1mHAVE\033[0m to read the docs
+Press \e[1m<RETURN>\e[0m to accept the default for any option, or enter
+a new value. Please note: You will \e[1mHAVE\e[0m to read the docs
 dir, otherwise you won't have a config file!
 
-Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos)
-Maximum file descriptors: \033[1;32m$config{MAX_CLIENT_T}\033[0m
-Your InspIRCd revision ID is \033[1;32mr$rev\033[0m";
-       if ($rev eq "r0") {
-               print " (Non-SVN build)";
-       }
-       print ".\n\n";
+Your operating system is: \e[1;32m$^O\e[0m 
+STOP
+       print "Your InspIRCd version is: \e[1;32m";
+       print "$version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL}";
+       print "\e[0m\n\n";
+       print "The following compiler has been detected: \e[1;32m$cxx{NAME} $cxx{VERSION}\e[0m ($config{CXX})\n\n";
 
-       $config{CHANGE_COMPILER} = "n";
-       print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
+       # Check that the user actually wants this version.
+       if ($version{LABEL} ne 'release') {
+               print <<"EOW" ;
+\e[1;31mWARNING!\e[0m You are building a development version. This contains code which has
+not been tested as heavily and may contain various faults which could seriously
+affect the running of your server. It is recommended that you use a stable
+version instead.
 
-       while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) {
-               print "\033[1;32mIMPORTANT!\033[0m A GCC 2.x compiler has been detected, and
-should NOT be used. You should probably specify a newer compiler.\n\n";
-               yesno(CHANGE_COMPILER,"Do you want to change the compiler?");
-               if ($config{CHANGE_COMPILER} =~ /y/i) {
-                       print "What command do you want to use to invoke your compiler?\n";
-                       print "[\033[1;32m$config{CC}\033[0m] -> ";
-                       chomp($config{CC} = <STDIN>);
-                       if ($config{CC} eq "") {
-                               $config{CC} = "g++";
-                       }
-                       chomp($foo = `$config{CC} -dumpversion | cut -c 1`);
-                       if ($foo ne "") {
-                               chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers
-                               print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
-                               if ($config{GCCVER} < 3) {
-                                       print "\033[1;32mGCC 2.x WILL NOT WORK!\033[0m. Let's try that again, shall we?\n";
-                               }
-                       }
-                       else {
-                               print "\033[1;32mWARNING!\033[0m Could not execute the compiler you specified. You may want to try again.\n";
-                       }
-               }
-       }
+You can obtain the latest stable version from https://github.com/inspircd/inspircd/releases
+or by running `git checkout insp20` if you are installing from Git.
 
-       print "\n";
+EOW
+       exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0);
+       }
 
        # Directory Settings..
        my $tmpbase = $config{BASE_DIR};
-       dir_check("do you wish to install the InspIRCd base", "BASE_DIR");
+       $config{BASE_DIR} = prompt_dir(1, 'What directory do you wish to install the InspIRCd base?', $config{BASE_DIR});
        if ($tmpbase ne $config{BASE_DIR}) {
-               $config{CONFIG_DIR}      = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Dir
-               $config{MODULE_DIR}      = resolve_directory($config{BASE_DIR}."/modules");     # Modules Directory
-               $config{BINARY_DIR}      = resolve_directory($config{BASE_DIR}."/bin");     # Binary Directory
-               $config{LIBRARY_DIR}    = resolve_directory($config{BASE_DIR}."/lib");      # Library Directory
+               $config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
+               $config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
+               $config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
+               $config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
+               $config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
        }
 
-       dir_check("are the configuration files", "CONFIG_DIR");
-       dir_check("are the modules to be compiled to", "MODULE_DIR");
-       dir_check("is the IRCd binary to be placed", "BINARY_DIR");
-       dir_check("are the IRCd libraries to be placed", "LIBRARY_DIR");
-
-       if ($has_kqueue) {
-               yesno(USE_KQUEUE,"You are running a BSD operating system, and kqueue\nwas detected. Would you like to enable kqueue support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable kqueue?");
-               print "\n";
-       }
-       if ($has_epoll) {
-               yesno(USE_EPOLL,"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
-               print "\n";
-       }
-       if ($has_ports) {
-               yesno(USE_PORTS,"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
-               print "\n";
-       }
-       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
-       if (!$chose_hiperf) {
-               print "No high-performance socket engines are available, or you chose\n";
-               print "not to enable one. Defaulting to select() engine.\n\n";
-       }
+       $config{BINARY_DIR} = prompt_dir(1, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR});
+       $config{CONFIG_DIR} = prompt_dir(1, 'In what directory are the configuration files to be stored?', $config{CONFIG_DIR});
+       $config{DATA_DIR} = prompt_dir(1, 'In what directory are variable data files to be stored?', $config{DATA_DIR});
+       $config{LOG_DIR} = prompt_dir(1, 'In what directory are log files to be stored?', $config{LOG_DIR});
+       $config{MODULE_DIR} = prompt_dir(1, 'In what directory are the modules to be placed?', $config{MODULE_DIR});
 
-       yesno(IPV6,"Would you like to build InspIRCd with IPv6 support?");
-       print "\n";
-
-       if ($config{IPV6} eq "y") {
-               print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
-               $config{SUPPORT_IP6LINKS} = "y";
-       } else {
-               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
-               print "\n";
-       }
-
-       if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
-               print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
-               print "I will default to GnuTLS. If you wish to use OpenSSL\n";
-               print "instead, you should enable the OpenSSL module yourself\n";
-               print "by copying it from src/modules/extra to src/modules.\n\n";
-               print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
-               print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
-       }
-
-       if ($config{HAS_GNUTLS} eq "y") {
-               yesno(USE_GNUTLS, "Would you like to enable SSL Support?");
-               if ($config{USE_GNUTLS} eq "y") {
-                       print "\nUsing GnuTLS SSL module.\n";
-               }
-       } elsif ($config{HAS_OPENSSL} eq "y") {
-                       yesno(USE_OPENSSL, "Would you like to enable SSL Support?");
-       if ($config{USE_OPENSSL} eq "y") {
-                       print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
+       my $chose_hiperf = 0;
+       if ($config{HAS_KQUEUE}) {
+               $config{USE_KQUEUE} = prompt_bool(1, 'Your operating system has support for the high performance kqueue socket engine. Would you like to enable it?', 1);
+               if ($config{USE_KQUEUE}) {
+                       $config{SOCKETENGINE} = "kqueue";
+                       $chose_hiperf = 1;
                }
        }
-       else {
-               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
-       }
-
-       print "\nThe following questions will ask you for various figures relating\n";
-       print "To your IRCd install. Please note that these should usually be left\n";
-       print "as defaults unless you have a real reason to change them. If they\n";
-       print "changed, then the values must be identical on all servers on your\n";
-       print "network, or malfunctions and/or crashes may occur, with the exception\n";
-       print "of the 'maximum number of clients' setting which may be different on\n";
-       print "different servers on the network.\n\n";
-
-       # File Descriptor Settings..
-       promptnumeric("number of clients at any one time", "MAX_CLIENT_T");
-       $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
-       $config{MAX_DESCRIPTORS} = $config{MAX_CLIENT_T};
-
-       promptnumeric("length of nicknames", "NICK_LENGT");
-       promptnumeric("length of channel names", "CHAN_LENGT");
-       promptnumeric("number of mode changes in one line", "MAXI_MODES");
-       promptnumeric("length of an ident (username)", "MAX_IDENT");
-       promptnumeric("length of a quit message", "MAX_QUIT");
-       promptnumeric("length of a channel topic", "MAX_TOPIC");
-       promptnumeric("length of a kick message", "MAX_KICK");
-       promptnumeric("length of a GECOS (real name)", "MAX_GECOS");
-       promptnumeric("length of an away message", "MAX_AWAY");
-}
-
-dumphash();
-
-if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
-{
-       print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n";
-       exit(0);
-}
-if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
-{
-       print "Sorry, but i couldn't detect openssl. Make sure openssl is in your path.\n";
-       exit(0);
-}
-
-if ($config{USE_GNUTLS} eq "y") {
-       $failed = 0;
-       open(TMP, "<src/modules/m_ssl_gnutls.cpp") or $failed = 1;
-       close(TMP);
-       if ($failed) {
-               print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
-               chdir("src/modules");
-               system("ln -s extra/m_ssl_gnutls.cpp");
-               chdir("../..");
-       }
-       getmodules();
-       if ($interactive)
-       {
-               $failed = 0;
-               open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
-               close(TMP);
-               open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
-               close(TMP);
-               if ($failed) {
-                       print "SSL Certificates Not found, Generating.. \n\n
-*************************************************************
-* Generating the Private Key may take some time, go grab a  *
-* Coffee. Even better, to generate some more entropy if it  *
-* is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the        *
-* Questions which follow. If you are unsure, just hit enter *
-*************************************************************\n\n";
-                       $failed = make_gnutls_cert();
-                       if ($failed) {
-                               print "\n\033[1;32mCertificate generation failed!\033[0m\n\n";
-                       } else {
-                               print "\nCertificate generation complete, copying to config directory... ";
-                               system("mv key.pem $config{CONFIG_DIR}/key.pem");
-                               system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
-                               print "Done.\n\n";
-                       }
-               }
-               else {
-                       print "SSL Certificates found, skipping.\n\n";
+       if ($config{HAS_EPOLL}) {
+               $config{USE_EPOLL} = prompt_bool(1, 'Your operating system has support for the high performance epoll socket engine. Would you like to enable it?', 1);
+               if ($config{USE_EPOLL}) {
+                       $config{SOCKETENGINE} = "epoll";
+                       $chose_hiperf = 1;
                }
        }
-       else
-       {
-               print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
-       }
-} elsif ($config{USE_OPENSSL} eq "y") {
-       $failed = 0;
-       open(TMP, "<src/modules/m_ssl_openssl.cpp") or $failed = 1;
-       close(TMP);
-       if ($failed) {
-               print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
-               chdir("src/modules");
-               system("ln -s extra/m_ssl_openssl.cpp");
-               chdir("../..");
+       if ($config{HAS_PORTS}) {
+               $config{USE_PORTS} = prompt_bool(1, 'Your operating system has support for the high performance IOCP socket engine. Would you like to enable it?', 1);
+               if ($config{USE_PORTS}) {
+                       $config{SOCKETENGINE} = "ports";
+                       $chose_hiperf = 1;
+               }
        }
-       getmodules();
-       $failed = 0;
-       if ($interactive)
-       {
-               open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
-               close(TMP);
-               open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
-               close(TMP);
-               if ($failed) {
-                       print "SSL Certificates Not found, Generating.. \n\n
-*************************************************************
-* Generating the certificates may take some time, go grab a *
-* coffee, or something.                                            *
-*************************************************************\n\n";
-                       make_openssl_cert();
-                       print "\nCertificate generation complete, copying to config directory... ";
-                       system("mv key.pem $config{CONFIG_DIR}/key.pem");
-                       system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
-                       system("mv dhparams.pem $config{CONFIG_DIR}/dhparams.pem");
-                       print "Done.\n\n";
-               } else {
-                       print "SSL Certificates found, skipping.\n\n"
+
+       if (!$chose_hiperf && $config{HAS_POLL}) {
+               $config{USE_POLL} = prompt_bool(1, 'Your operating system has support for the mid performance poll socket engine. Would you like to enable it?', 1);
+               if ($config{USE_POLL}) {
+                       $config{SOCKETENGINE} = "poll";
                }
        }
-       else
+       unless ($chose_hiperf || $config{USE_POLL})
        {
-               print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
-       }
-}
-if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
-       print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
-}
-
-getosflags();
-writefiles(1);
-makecache();
-
-print "\n\n";
-print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
-if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
-       print "Please remember that to enable \033[1;32mSSL support\033[0m you must\n";
-       print "load the required modules in your config. This configure process\n";
-       print "has just prepared these modules to be compiled for you, and has not\n";
-       print "configured them to be compiled into the core of the ircd.\n";
-}
-print "*** \033[1;32mRemember to edit your configuration files!!!\033[0m ***\n\n\n";
-if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) {
-       print "\033[1;32mWARNING!\033[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but i'm letting you\ngo ahead with it anyway, just in case i'm wrong :-)\n";
-}
-
-if ($config{GCCVER} < "3") {
-       print <<FOO2;
-\033[1;32mWARNING!\033[0m You are attempting to compile InspIRCd on GCC 2.x!
-GCC 2.x series compilers only had partial (read as broken) C++ support, and
-your compile will most likely fail horribly! If you have any problems, do NOT
-report them to the bugtracker or forums without first upgrading your compiler
-to a newer 3.x or 4.x (or whatever is available currently) version.
-FOO2
-}
-
-################################################################################
-#                            HELPER FUNCTIONS                          #
-################################################################################
-sub getcache {
-       # Retrieves the .config.cache file, and loads values into the main config hash.
-       open(CACHE, ".config.cache") or return 0;
-       while (<CACHE>) {
-               chomp;
-               # Ignore Blank lines, and comments..
-               next if /^\s*$/;
-               next if /^\s*#/;
-               my ($key, $value) = split("=", $_, 2);
-               $value =~ /^\"(.*)\"$/;
-               # Do something with data here!
-               $config{$key} = $1;
+               print "No high-performance socket engines are available, or you chose not to enable one. Defaulting to select() engine.\n\n";
+               $config{SOCKETENGINE} = "select";
        }
-       close(CONFIG);
-       return 1;
-}
 
-sub makecache {
-       # Dump the contents of %config
-       print "Writing \033[1;32mcache file\033[0m for future ./configures ...\n";
-       open(FILEHANDLE, ">.config.cache");
-       foreach $key (keys %config) {
-               print FILEHANDLE "$key=\"$config{$key}\"\n";
-       }
-       close(FILEHANDLE);
-}
+       if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y")
+       {
+               print "Detected GnuTLS version: \e[1;32m" . $gnutls_ver . "\e[0m\n";
+               print "Detected OpenSSL version: \e[1;32m" . $openssl_ver . "\e[0m\n\n";
 
-sub dir_check {
-       my ($desc, $hash_key) = @_;
-       my $complete = 0;
-       while (!$complete) {
-               print "In what directory $desc?\n";
-               print "[\033[1;32m$config{$hash_key}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{$hash_key};
-               }
-               if ($var =~ /^\~\/(.+)$/) {
-                       # Convert it to a full path..
-                       $var = resolve_directory($ENV{HOME} . "/" . $1);
-               }
-               elsif ((($config{OSNAME} =~ /MINGW32/i) and ($var !~ /^[A-Z]{1}:\\.*/)) and (substr($var,0,1) ne "/"))
+               $config{USE_SSL} = prompt_bool(1, 'One or more SSL libraries detected. Would you like to enable SSL support?', 1);
+               if ($config{USE_SSL})
                {
-                       # Assume relative Path was given.. fill in the rest.
-                       $var = $this . "/$var";
-               }
-               
-               $var = resolve_directory($var); 
-               if (! -e $var) {
-                       print "$var does not exist. Create it?\n[\033[1;32my\033[0m] ";
-                       chomp($tmp = <STDIN>);
-                       if (($tmp eq "") || ($tmp =~ /^y/i)) {
-                               # Attempt to Create the Dir..
-                               
-                               system("mkdir -p \"$var\" >> /dev/null 2>&1");
-                               $chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
-                               if ($chk != 0) {
-                                       print "Unable to create directory. ($var)\n\n";
-                                       # Restart Loop..
-                                       next;
+                       if ($config{HAS_GNUTLS} eq "y")
+                       {
+                               $config{USE_GNUTLS} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_gnutls (recommended)?', 1);
+                               if ($config{USE_GNUTLS})
+                               {
+                                       print "Using GnuTLS SSL module.\n\n";
+                                       unlink 'src/modules/m_ssl_gnutls.cpp' if -f 'src/modules/m_ssl_gnutls.cpp';
+                                       symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!\n";
                                }
-                       } else {
-                               # They said they don't want to create, and we can't install there.
-                               print "\n\n";
-                               next;
-                       }
-               } else {
-                       if (!is_dir($var)) {
-                               # Target exists, but is not a directory.
-                               print "File $var exists, but is not a directory.\n\n";
-                               next;
                        }
-               }
-               # Either Dir Exists, or was created fine.
-               $config{$hash_key} = $var;
-               $complete = 1;
-               print "\n";
-       }
-}
 
-sub getosflags {
-
-       $config{LDLIBS} = "-lstdc++";
-       $config{FLAGS}  = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
-       $config{DEVELOPER} = "-fPIC -Wall -pedantic -g";
-       $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath;
-       $config{MAKEPROG} = "make";
-
-       if ($config{OSNAME} =~ /darwin/i) {
-               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -pedantic $config{OPTIMISATI}";
-               $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
-               $config{LDLIBS} = "-ldl -lstdc++";
-       }
-
-       if ($config{OSNAME} =~ /OpenBSD/i) {
-               $config{MAKEPROG} = "gmake";
-               $config{LDLIBS} = $config{LDLIBS} . " -lunwind";
-               chomp($foo = `eg++ -dumpversion | cut -c 1`);
-               # theyre running the package version of gcc (eg++)... detect it and set up its version numbers.
-               # if theyre not running this, configure lets the build continue but they probably wont manage to
-               # compile as this standard version is 2.95.3!
-               if ($foo ne "") {
-                       $config{CC} = "eg++";
-                       chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path
+                       if ($config{HAS_OPENSSL} eq "y")
+                       {
+                               $config{USE_OPENSSL} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_openssl (recommended)?', 1);
+                               if ($config{USE_OPENSSL})
+                               {
+                                       print "Using OpenSSL SSL module.\n\n";
+                                       unlink 'src/modules/m_ssl_openssl.cpp' if -f 'src/modules/m_ssl_openssl.cpp';
+                                       symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!\n";
+                               }
+                       }
                }
-               return "OpenBSD";
-       }
-
-       if ($config{OSNAME} =~ /Linux/i) {
-               $config{LDLIBS} = "-ldl -lstdc++";
-               $config{FLAGS}  = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
-               $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
-               $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
-               $config{MAKEPROG} = "make";
-       }
-
-       if ($config{OSNAME} =~ /FreeBSD/i) {
-               $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
-               $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
-       }
-
-       if ($config{OSNAME} =~ /SunOS/i or $config{OSNAME} =~ /solaris/i)
-       {
-               # solaris/sunos needs these
-               # socket = bsd sockets api
-               # nsl = dns stuff
-               # rt = POSIX realtime extensions
-               # resolv = inet_aton only (why isnt this in nsl?!)
-               $config{MAKEPROG} = "gmake";
-               $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv";
-               return "Solaris";
        }
-       
-       if($config{OSNAME} =~ /MINGW32/i)
+       else
        {
-               # All code is position-independent on windows
-               $config{FLAGS} =~ s/-fPIC //;
-               return "MinGW";
+               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
+               print "is in your path.\n\n";
        }
-
-       return $config{OSNAME};
 }
 
-sub writefiles {
-       my($writeheader) = @_;
-       # First File.. inspircd_config.h
-       chomp(my $incos = `uname -n -s -r`);
-       chomp($version = `sh src/version.sh`);
-       chomp(my $revision2 = getrevision());
-       if ($writeheader == 1)
-       {
-               print "Writing \033[1;32minspircd_config.h\033[0m\n";
-               open(FILEHANDLE, ">include/inspircd_config.h");
-               my $NL = $config{NICK_LENGT}+1;
-               my $CL = $config{CHAN_LENGT}+1;
-               print FILEHANDLE <<EOF;
-/* Auto generated by configure, do not modify! */
-#ifndef __CONFIGURATION_AUTO__
-#define __CONFIGURATION_AUTO__
-
-/* this is for windows support. */
-#define CoreExport /**/
-#define DllExport /**/
-
-#define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
-#define MOD_PATH "$config{MODULE_DIR}"
-#define VERSION "$version"
-#define REVISION "$revision2"
-#define MAXCLIENTS $config{MAX_CLIENT}
-#define MAXCLIENTS_S "$config{MAX_CLIENT}"
-#define SOMAXCONN_S "$config{_SOMAXCONN}"
-#define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
-#define NICKMAX $NL
-#define CHANMAX $CL
-#define MAXMODES $config{MAXI_MODES}
-#define IDENTMAX $config{MAX_IDENT}
-#define MAXQUIT $config{MAX_QUIT}
-#define MAXTOPIC $config{MAX_TOPIC}
-#define MAXKICK $config{MAX_KICK}
-#define MAXGECOS $config{MAX_GECOS}
-#define MAXAWAY $config{MAX_AWAY}
-#define OPTIMISATION $config{OPTIMITEMP}
-#define LIBRARYDIR "$config{LIBRARY_DIR}"
-#define SYSTEM "$incos"
-EOF
-print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
-
-               if ($config{OSNAME} =~ /SunOS/i) {
-                       print FILEHANDLE "#define IS_SOLARIS\n";
-               }
-               if ($config{OSNAME} =~ /MINGW32/i) {
-                       print FILEHANDLE "#define IS_MINGW\n";
-               }
-               if ($config{GCCVER} >= 3) {
-                       print FILEHANDLE "#define GCC3\n";
-               }
-               if ($config{HAS_STRLCPY} eq "true") {
-                       print FILEHANDLE "#define HAS_STRLCPY\n";
-               }
-               if ($config{HAS_STDINT} eq "true") {
-                       print FILEHANDLE "#define HAS_STDINT\n";
-               }
-               if ($config{IPV6} =~ /y/i) {
-                       print FILEHANDLE "#define IPV6\n";
-               }
-               if ($config{SUPPORT_IP6LINKS} =~ /y/i) {
-                       print FILEHANDLE "#define SUPPORT_IP6LINKS\n";
-               }
-               my $use_hiperf = 0;
-               if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-                       print FILEHANDLE "#define USE_KQUEUE\n";
-                       $se = "socketengine_kqueue";
-                       $use_hiperf = 1;
-               }
-               if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-                       print FILEHANDLE "#define USE_EPOLL\n";
-                       $se = "socketengine_epoll";
-                       $use_hiperf = 1;
-               }
-               if (($has_ports) && ($config{USE_PORTS} eq "y")) {
-                       print FILEHANDLE "#define USE_PORTS\n";
-                       $se = "socketengine_ports";
-                       $use_hiperf = 1;
-               }
-               # user didn't choose either epoll or select for their OS.
-               # default them to USE_SELECT (ewwy puke puke)
-               if (!$use_hiperf) {
-                       print FILEHANDLE "#define USE_SELECT\n";
-                       $se = "socketengine_select";
-               }
-               print FILEHANDLE "\n#endif\n";
-               close(FILEHANDLE);
-       }
+# We are on a POSIX system, we can enable POSIX extras without asking
+symlink "extra/m_regex_posix.cpp", "src/modules/m_regex_posix.cpp";
 
-       if ($writeheader)
-       {
-               open(FILEHANDLE, ">include/inspircd_se_config.h");
-               print FILEHANDLE <<EOF;
-/* Auto generated by configure, do not modify or commit to svn! */
-#ifndef __CONFIGURATION_SOCKETENGINE__
-#define __CONFIGURATION_SOCKETENGINE__
-
-#include "socketengines/$se.h"
-
-#endif
-EOF
-               close(FILEHANDLE);
-       }
-
-
-       # Create a Modules List..
-       my $modules = "";
-       foreach $i (@modlist)
-       {
-               $modules .= "m_".$i.".so ";
-       }
-       chomp($modules);   # Remove Redundant whitespace..
-
-       opendir(DIRHANDLE, "src/modules");
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^m_(.+?)$/) {
-                       if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
-                               closedir(MDIRHANDLE);
-                               $modules .= "$name.so ";
-                               $uninstall_list = $uninstall_list . "   -rm \$(MODULES)/$name.so\n";
-                       }
-               }
-       }
-       closedir(DIRHANDLE);
-
-
-       # Write all .in files.
-       my $tmp = "";
-       my $file = "";
-       my $exe = "inspircd";
-
-       # Do this once here, and cache it in the .*.inc files,
-       # rather than attempting to read src/version.sh from
-       # compiled code -- we might not have the source to hand.
-       # Fix for bug#177 by Brain.
-
-       chomp(my $version = `sh ./src/version.sh`);
-       chomp(my $revision = getrevision());
-       $version = "$version(r$revision)";
-
-       # We can actually parse any file starting with . and ending with .inc,
-       # but right now we only parse .inspircd.inc to form './inspircd'
-
-        print "Writing \033[1;32mMakefiles\033[0m\n";
-       write_dynamic_modules_makefile();
-       write_dynamic_makefile();
-
-       opendir(DIRHANDLE, $this);
-
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^\.(.+)\.inc$/) {
-                       $file = $1;
-
-                       # Bug #353, omit this on non-darwin
-                       next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist"));
+if (($config{USE_GNUTLS}) && ($config{HAS_GNUTLS} ne "y"))
+{
+       print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n";
+       exit 1;
+}
+if (($config{USE_OPENSSL}) && ($config{HAS_OPENSSL} ne "y"))
+{
+       print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config is in your path.\n";
+       exit 1;
+}
 
-                       # All .name.inc files need parsing!
-                       $tmp = "";
-                       open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc");
-                       while (<FILEHANDLE>) {
-                               $tmp .= $_;
+if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) {
+       if (my $val = prompt_bool($interactive, 'Would you like to generate SSL certificates now?', $interactive)) {
+               unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem" && -r "$config{CONFIG_DIR}/dhparams.pem") {
+                       unless (system './tools/genssl auto') {
+                               print "\nCertificate generation complete, copying to config directory... ";
+                               File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n";
+                               File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n";
+                               File::Copy::move("dhparams.pem", "$config{CONFIG_DIR}/dhparams.pem") or print STDERR "Could not copy dhparams.pem!\n";
+                               print "Done.\n\n";
                        }
-                       close(FILEHANDLE);
-
-                       print "Writing \033[1;32m$file\033[0m ...\n";
-                       $tmp =~ s/\@CC\@/$config{CC}/;
-                       $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
-                       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
-                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
-                       $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
-                       $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
-                       $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
-                       $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
-                       $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
-                       $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
-                       $tmp =~ s/\@MODULES\@/$modules/;
-                       $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/;
-                       $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/;
-                       $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/;
-                       $tmp =~ s/\@EXECUTABLE\@/$exe/;
-                       $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
-                       $tmp =~ s/\@VERSION\@/$version/;
-                       $tmp =~ s/\@INSTALL_LIST\@/$install_list/;
-                       $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/;
-
-                       open(FILEHANDLE, ">$file");
-                       print FILEHANDLE $tmp;
+               } else {
+                       print "SSL certificates found, skipping.\n\n"
                }
+       } else {
+               print "Skipping SSL certificate generation in non-interactive mode.\n\n";
        }
-       closedir(DIRHANDLE);
-
-       # Make inspircd executable!
-       chmod 0744, 'inspircd';
-}
-
-sub write_dynamic_modules_makefile {
-       # Modules Makefile..
-       print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
-       open(FILEHANDLE, ">src/modules/Makefile");
-
-###
-# Module Makefile Header
-###
-       print FILEHANDLE <<EOF;
-###################################################
-# Copyright 2002-2007 The InspIRCd Development Team
-#  http://www.inspircd.org/wiki/index.php/Credits
-#
-# Thanks to Andrew Church <achurch\@achurch.org>
-#   for assisting with making this work right.
-#
-# Automatically Generated by ./configure to add a
-#  modules please run ./configure -modupdate
-###################################################
-
-all: \$(MODULES)
-
-EOF
-
-if ($config{OSNAME} =~ /darwin/) {
-               print FILEHANDLE <<EOCHEESE;
-
-PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
-
-EOCHEESE
 } else {
-               print FILEHANDLE <<EOCHEESE;
-
-PICLDFLAGS = -fPIC -DPIC -shared
-
-EOCHEESE
+       print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
 }
 
-       ###
-       # End Module Makefile Header
-       ###
-
-       # Create a Modules List..
-       my $modules = "";
-       my $cmflags = "";
-       my $liflags = "";
-       foreach $i (@modlist) {
-               ###
-               # Write Entry to the MakeFile
-               ###
-               $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
-               $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
-               $deps = getdependencies("src/modules/m_".$i.".cpp");
-       
-               #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
-       
-
-               $nicerflags = $config{FLAGS};
-               $nicerflags =~ s/-pedantic//g;
-
-               if (nopedantic("src/modules/m_".$i.".cpp"))
-               {
-                       print FILEHANDLE "
-m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
-       \$(CC) -pipe -I../../include $nicerflags $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
-"
-               }
-               else
-               {
-                       print FILEHANDLE "
-m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
-       \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
-";
-               }
-               $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
-               ###
-       }
-
-       opendir(DIRHANDLE, "src/modules");
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^m_(.+?)$/) {
-                       $mfrules = "";
-                       $mobjs = "";
-                       $mliflags = "";
-                       $mfcount = 0;
-                       # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
-                       if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
-                               read_module_directory("src/modules/$name", $name);
-                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... (\033[1;32m$mfcount files found\033[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"; 
-                               if ($config{IS_DARWIN} eq "YES") {
-                                       print FILEHANDLE "      \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n"; 
+print "Writing \e[1;32m.config.cache\e[0m ...\n";
+write_configure_cache(%config);
+parse_templates(\%config, \%cxx);
+dump_hash();
+
+print "\n";
+print "To build your server with these settings, please run '\e[1;32mmake\e[0m' now.\n";
+if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) {
+       print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n";
+       print "modules in your config. This configure script has added those modules to the\n";
+       print "build process. For more info, please refer to:\n";
+       print "\e[1;32mhttp://wiki.inspircd.org/Installation_From_Tarball\e[0m\n";
+}
+print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n";
+
+# Routine to list out the extra/ modules that have been enabled.
+# Note: when getting any filenames out and comparing, it's important to lc it if the
+# file system is not case-sensitive (== Epoc, MacOS, OS/2 (incl DOS/DJGPP), VMS, Win32
+# (incl NetWare, Symbian)). Cygwin may or may not be case-sensitive, depending on
+# configuration, however, File::Spec does not currently tell us (it assumes Unix behavior).
+sub list_extras () {
+       use File::Spec;
+       # @_ not used
+       my $srcdir = File::Spec->catdir("src", "modules");
+       my $abs_srcdir = File::Spec->rel2abs($srcdir);
+       local $_;
+       my $dd;
+       opendir $dd, File::Spec->catdir($abs_srcdir, "extra") or die (File::Spec->catdir($abs_srcdir, "extra") . ": $!\n");
+       my @extras = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+       closedir $dd;
+       undef $dd;
+       opendir $dd, $abs_srcdir or die "$abs_srcdir: $!\n";
+       my @sources = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+       closedir $dd;
+       undef $dd;
+       my $maxlen = (sort { $b <=> $a } (map {length($_)} (@extras)))[0];
+       my %extras = ();
+EXTRA: for my $extra (@extras) {
+               next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra);
+               my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
+               my $abs_source = File::Spec->catfile($abs_srcdir, $extra);
+               next unless ($extra =~ m/\.(cpp|h)$/ || (-d $abs_extra)); # C++ Source/Header, or directory
+               if (-l $abs_source) {
+                       # Symlink, is it in the right place?
+                       my $targ = readlink($abs_source);
+                       my $abs_targ = File::Spec->rel2abs($targ, $abs_srcdir);
+                       if ($abs_targ eq $abs_extra) {
+                               $extras{$extra} = "\e[32;1menabled\e[0m";
+                       } else {
+                               $extras{$extra} = sprintf("\e[31;1mwrong symlink target (%s)\e[0m", $abs_targ);
+                       }
+               } elsif (-e $abs_source) {
+                       my ($devext, $inoext) = stat($abs_extra);
+                       my ($devsrc, $inosrc, undef, $lnksrc) = stat($abs_source);
+                       if ($lnksrc > 1) {
+                               if ($devsrc == $devext && $inosrc == $inoext) {
+                                       $extras{$extra} = "\e[32;1menabled\e[0m";
                                } else {
-                                       print FILEHANDLE "      \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n";
+                                       $extras{$extra} = sprintf("\e[31;1mwrong hardlink target (%d:%d)\e[0m", $devsrc, $inosrc);
+                               }
+                       } else {
+                               open my $extfd, "<", $abs_extra;
+                               open my $srcfd, "<", $abs_source;
+                               local $/ = undef;
+                               if (scalar(<$extfd>) eq scalar(<$srcfd>)) {
+                                       $extras{$extra} = "\e[32;1menabled\e[0m";
+                               } else {
+                                       $extras{$extra} = sprintf("\e[31;1mout of synch (re-copy)\e[0m");
                                }
-                               print FILEHANDLE "\n$mfrules\n";
-                               closedir(MDIRHANDLE);
-                               $install_list = $install_list . "       install -m \$(INSTMODE) src/modules/$name.so \$(MODPATH)\n";
-                       }
-               }
-       }
-       closedir(DIRHANDLE);
-}
-
-sub read_module_directory {
-       my ($dpath, $reldpath) = @_;
-       
-       if (opendir(MDIRHANDLE, $dpath) == 0) {
-               return;
-       }
-       
-       foreach $fname (sort readdir(MDIRHANDLE)) {
-               if ($fname =~ /\.cpp$/) {
-                       $cmflags = getcompilerflags("$dpath/$fname");
-                       $mliflags = $mliflags . " " . getlinkerflags("$dpath/$fname");
-                       $deps = getdependencies("$dpath/$fname");
-                       $oname = $fname;
-                       $oname =~ s/\.cpp$/.o/g;
-                       $mfrules = $mfrules .  "$reldpath/$oname: $reldpath/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
-                       $mfrules = $mfrules .  "        \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $reldpath/$oname -c $reldpath/$fname\n\n";
-                       $mobjs = $mobjs . " $reldpath/$oname";
-                       $mfcount++;
-               }
-               elsif ((-d "$dpath/$fname") && !($fname eq ".") && !($fname eq "..")) {
-                       read_module_directory($dpath."/".$fname, $reldpath."/".$fname);
-               }
-       }
-}
-
-sub calcdeps($)
-{
-       # Yes i know we could use gcc -M but it seems to ideneify a lot of 'deep'
-       # dependencies which are not relevent in C++.
-
-       my $file = $_[0];
-
-       open (CPP, "<$file") or die("Can't open $file for reading!");
-
-       my %dupe = ();
-       my $retlist = "";
-
-       foreach my $d (@ignoredeps)
-       {
-               $dupe{$d} = 1;
-       }
-
-       my $immutable = "";
-       foreach my $dep (@immutabledeps)
-       {
-               $immutable = $immutable . "../include/$dep ";
-       }
-       $immutable =~ s/ $//g;
-
-       while (chomp($line = <CPP>))
-       {
-               if ($line =~ /#include "(.+\.h)"/)
-               {
-                       if (!exists($dupe{$1}))
-                       {
-                               $retlist = $retlist . "../include/$1 ";
-                               $dupe{$1} = 1;
                        }
-               }
-       }
-       close CPP;
-       return length($immutable) ? $immutable . " " . $retlist : $retlist;
-}
-
-sub write_dynamic_makefile
-{
-       my $i = 0;
-       my @cmdlist = ();
-       my %existing_install_list = ();
-       opendir(DIRHANDLE, "src/commands");
-       foreach $name (sort readdir(DIRHANDLE))
-       {
-               if ($name =~ /^cmd_(.+)\.cpp$/)
-               {
-                       $cmdlist[$i++] = $1;
-                       $install_list = $install_list . "       -install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n";
-                       $uninstall_list = $uninstall_list . "   -rm \$(LIBPATH)/cmd_$1.so\n";
-               }
-       }
-       closedir(DIRHANDLE);
-
-       if (!$has_epoll)
-       {
-               $config{USE_EPOLL} = 0;
-       }
-       if (!$has_kqueue)
-       {
-               $config{USE_KQUEUE} = 0;
-       }
-       if (!$has_ports)
-       {
-               $config{USE_PORTS} = 0;
-       }
-
-       foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules"))
-       {
-               print "Scanning \033[1;32m$dir\033[0m for core files ";
-               opendir(DIRHANDLE, $dir);
-               foreach $name (sort readdir(DIRHANDLE))
-               {
-                       if ($name =~ /\.cpp$/)
-                       {
-                               open (CPP, "<$dir/$name") or die("Can't open $dir/$name to scan it! oh bugger");
-                               print ".";
-                               while (chomp($line = <CPP>))
-                               {
-                                       if ($line =~ /\/\* \$Core: (\w+) \*\//i)
-                                       {
-                                               $filelist{$name} = $1;
-                                       }
-                                       elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i)
-                                       {
-                                               $specialdeps{$name} = $1;
-                                       }
-                                       elsif ($line =~ /\/\* \$ExtraObjects: (.*?) \*\//i)
-                                       {
-                                               $extraobjects{$name} = $1;
-                                       }
-                                       elsif ($line =~ /\/\* \$ExtraBuild: (.*?) \*\//i)
-                                       {
-                                               $extrabuildlines{$name} = $1;
-                                       }
-                                       elsif ($line =~ /\/\* \$ExtraSources: (.*?) \*\//i)
-                                       {
-                                               $extrasources{$name} = $1;
-                                               }
-                                       elsif ($line =~ /\/\* \$If: (\w+) \*\//i)
-                                       {
-                                               if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
-                                               {
-                                                       # Skip to 'endif'
-                                                       while (chomp($line = <CPP>))
-                                                       {
-                                                               die ("\$If buildsystem instruction within another \$If in file $dir/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
-                                                               last if ($line =~ /\/\* \$EndIf \*\//i);
-                                                       }
-                                               }
-                                       }
-                                       elsif ($line =~ /\/\* \$Install: (.*?) \*\//i)
-                                       {
-                                               if (!exists($existing_install_list{$1}))
-                                               {
-                                                       $existing_install_list{$1} = 1;
-                                                       $idir = (split(' ',$1))[1];
-                                                       $ifile = (split(' ',$1))[0];
-                                                       $install_list = $install_list . "       -install -m \$(INSTMODE) $1\n";
-                                                       $ifile =~ s/.*\///g;
-                                                       $uninstall_list = $uninstall_list . "   -rm $idir/$ifile\n";
-                                               }
+               } else {
+                       $extras{$extra} = "\e[33;1mdisabled\e[0m";
+               }
+       }
+       # Now let's add dependency info
+       for my $extra (keys(%extras)) {
+               next unless $extras{$extra} =~ m/enabled/; # only process enabled extras.
+               my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
+               my @deps = split /\s+/, get_property($abs_extra, 'ModDep');
+               for my $dep (@deps) {
+                       if (exists($extras{$dep})) {
+                               my $ref = \$extras{$dep}; # Take reference.
+                               if ($$ref !~ m/needed by/) {
+                                       # First dependency found.
+                                       if ($$ref =~ m/enabled/) {
+                                               $$ref .= " (needed by \e[32;1m$extra\e[0m";
+                                       } else {
+                                               $$ref =~ s/\e\[.*?m//g; # Strip out previous coloring. Will be set in bold+red+blink later.
+                                               $$ref .= " (needed by \e[0;32;1;5m$extra\e[0;31;1;5m";
                                        }
-                                       elsif ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i)
-                                       {
-                                               if (!exists($existing_install_list{$1}))
-                                               {
-                                                       $existing_install_list{$1} = 1;
-                                                       $idir = (split(' ',$1))[1];
-                                                       $ifile = (split(' ',$1))[0];
-                                                       $install_list = $install_list . "       -cp $1\n";
-                                                       $ifile =~ s/.*\///g;
-                                                       $uninstall_list = $uninstall_list . "   -rm $idir/$ifile\n";
-                                               }
+                               } else {
+                                       if ($$ref =~ m/enabled/) {
+                                               $$ref .= ", \e[32;1m$extra\e[0m";
+                                       } else {
+                                               $$ref .= ", \e[0;32;1;5m$extra\e[0;31;1;5m";
                                        }
                                }
-                               close CPP;
                        }
                }
-               closedir(DIRHANDLE);
-               print " done!\n";
-       }
-
-       $freebsd4libs = $config{CRAQ};
-
-       my $all = "all: ";
-       $all_libsonly = "";
-
-       if ($config{IS_DARWIN} eq "YES")
-       {
-               $libraryext = "dylib";
-               $othercrap = "  \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp\n   \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
        }
-       else
-       {
-               $libraryext = "so";
-               $RPATH = "-Wl,--rpath -Wl,$config{LIBRARY_DIR}" unless defined $opt_disablerpath;
-               $othercrap = "  \$(CC) -pipe -I../include $RPATH \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
-       }
-
-       foreach my $cpp (sort keys %filelist)
-       {
-               $all = $all . $filelist{$cpp} . "." . $libraryext . " ";
-               $all_libsonly = $all_libsonly . $filelist{$cpp} . "." . $libraryext . " ";
-               $install_list = $install_list . "       -install -m \$(INSTMODE) src/" . $filelist{$cpp} . "." . $libraryext . " \$(LIBPATH)\n";
-               $uninstall_list = $uninstall_list . "   -rm \$(LIBPATH)/" . $filelist{$cpp} . "." . $libraryext . "\n";
+       for my $extra (sort {$a cmp $b} keys(%extras)) {
+               my $text = $extras{$extra};
+               if ($text =~ m/needed by/ && $text !~ m/enabled/) {
+                       printf "\e[31;1;5m%-*s = %s%s\e[0m\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? ")" : "");
+               } else {
+                       printf "%-*s = %s%s\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? "\e[0m)" : "");
+               }
        }
-       $all = $all . "moo inspircd\n";
-
-       $othercrap = $othercrap . " $all_libsonly\n\n";
-
-       open(FH,">src/Makefile") or die("Could not write src/Makefile");
-       print FH <<EOM;
-
-CC = im a cheezeball
-CXXFLAGS = -I../include \${FLAGS}
-CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
-RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
-
-EOM
-
-       print FH "$all\n\n";
-
-       $deps = calcdeps("src/inspircd.cpp");
-       print FH "inspircd: inspircd.cpp $deps $all_libsonly\n";
-       print FH "$othercrap\n";
+       return keys(%extras) if wantarray; # Can be used by manage_extras.
+}
 
-       foreach my $cpp (sort keys %filelist)
-       {
-               my $thislib = $filelist{$cpp} . "." . $libraryext; 
-               my $objs = $cpp;
-               my $rawcpp = $cpp;
-               $objs =~ s/\.cpp$/.o/;
-               if (exists($extraobjects{$cpp}))
-               {
-                       $objs = $objs . " " . $extraobjects{$cpp};
+sub enable_extras (@) {
+       my (@extras) = @_;
+       for my $extra (@extras) {
+               my $extrapath = "src/modules/extra/$extra";
+               if (!-e $extrapath) {
+                       print STDERR "Cannot enable \e[32;1m$extra\e[0m : No such file or directory in src/modules/extra\n";
+                       next;
                }
-               if (exists($extrasources{$cpp}))
-               {
-                       $rawcpp = $rawcpp . " " . $extrasources{$cpp};
+               my $source = "src/modules/$extra";
+               if (-e $source) {
+                       print STDERR "Cannot enable \e[32;1m$extra\e[0m : destination in src/modules exists (might already be enabled?)\n";
+                       next;
                }
-               if ($config{IS_DARWIN} eq "YES")
-               {
-                       $libcrap = "-install_name " . $config{LIBRARY_DIR} . "/" . $thislib . " -dynamiclib -twolevel_namespace -undefined dynamic_lookup";
-               }
-               else
-               {
-                       if (defined $opt_disablerpath)
-                       {
-                               $libcrap = " -shared";
-                       }
-                       else
-                       {
-                               $libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
+               # Get dependencies, and add them to be processed.
+               my @deps = split /\s+/, get_property($extrapath, 'ModDep');
+               for my $dep (@deps) {
+                       next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway.
+                       if (!-e "src/modules/$dep" && !-e "include/$dep") {
+                               if (-e "src/modules/extra/$dep") {
+                                       print STDERR "Will also enable extra \e[32;1m$dep\e[0m (needed by \e[32;1m$extra\e[0m)\n";
+                                       push @extras, $dep;
+                               } else {
+                                       print STDERR "\e[33;1mWARNING:\e[0m module \e[32;1m$extra\e[0m might be missing dependency \e[32;1m$dep\e[0m - YOU are responsible for satisfying it!\n";
+                               }
                        }
                }
-               $deps = calcdeps("src/$cpp");
-               if (exists($extrasources{$cpp}))
-               {
-                       foreach my $seperate (sort split(' ',$extrasources{$cpp}))
-                       {
-                               $d = calcdeps("src/$extrasources{$cpp}") . " ";
-                               if ($d ne "")
-                               {
-                                       $deps = $deps . $d . " ";
+               print "Enabling $extra ... \n";
+               symlink "extra/$extra", $source or print STDERR "$source: Cannot link to 'extra/$extra': $!\n";
+       }
+}
+
+sub disable_extras (@)
+{
+       opendir my $dd, "src/modules/extra/";
+       my @files = readdir($dd);
+       closedir $dd;
+       my (@extras) = @_;
+EXTRA: for my $extra (@extras) {
+               my $extrapath = "src/modules/extra/$extra";
+               my $source = "src/modules/$extra";
+               if (!-e $extrapath) {
+                       print STDERR "Cannot disable \e[32;1m$extra\e[0m : Is not an extra\n";
+                       next;
+               }
+               if ((! -l $source) || readlink($source) ne "extra/$extra") {
+                       print STDERR "Cannot disable \e[32;1m$extra\e[0m : Source is not a link or doesn't refer to the right file. Remove manually if this is in error.\n";
+                       next;
+               }
+               # Check if anything needs this.
+               for my $file (@files) {
+                       my @deps = split /\s+/, get_property("src/modules/extra/$file", 'ModDep');
+                       # File depends on this extra...
+                       if (scalar(grep { $_ eq $extra } @deps) > 0) {
+                               # And is both enabled and not about to be disabled.
+                               if (-e "src/modules/$file" && scalar(grep { $_ eq $file } @extras) < 1) {
+                                       print STDERR "Cannot disable \e[32;1m$extra\e[0m : is needed by \e[32;1m$file\e[0m\n";
+                                       next EXTRA;
                                }
                        }
                }
-               print FH $thislib . ": $cpp $deps ". $specialdeps{$cpp} . "\n";
-               print FH "      \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $rawcpp\n";
-               if (exists($extrabuildlines{$cpp}))
-               {
-                       print FH "      " . $extrabuildlines{$cpp} . "\n";
-               }
-               print FH "      \$(CC) -pipe $libcrap -o " . $thislib . " " . $objs . "\n\n";
+               # Now remove.
+               print "Disabling $extra ... \n";
+               unlink "src/modules/$extra" or print STDERR "Cannot disable \e[32;1m$extra\e[0m : $!\n";
        }
-
-       print FH "moo:\n        \${MAKE} -C \"commands\" DIRNAME=\"src/commands\" CC=\"\$(CC)\" \$(MAKEARGS)\n\n";
-
-       # close main makefile
-       close(FH);
-
-       # generate a list of .so
-       foreach my $cmd (@cmdlist) {
-               $cmdobjs = $cmdobjs . "cmd_$cmd.so ";
-       }
-
-       # and now reopen the commands makefile
-       open(FH,">src/commands/Makefile") or die("Could not write src/commands/Makefile");
-       print FH <<ITEM;
-CC = i am cornholio
-CXXFLAGS = -I../../include ${FLAGS}
-
-all: $cmdobjs
-
-
-ITEM
-
-       # now print the command file details.
-       foreach my $cmd (@cmdlist) {
-               print FH <<ITEM;
-cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/globals.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
-       \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-       \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
-
-ITEM
-       }
-#try build a .so, no intermediate .o
-#      \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so
-
-#this works for sure
-#      \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-#      \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
 }
-