X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=83c11b5d23ec95585d1b16a1ccf6686a801f26d0;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=8b9689b2908e0cf0f36a7d32ce40e1eb147810da;hpb=b6a2b91f8fe36db77a9521a8fba26430cd3796a3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 8b9689b29..83c11b5d2 100755
--- a/configure
+++ b/configure
@@ -1,16 +1,19 @@
 #!/usr/bin/env perl
-
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   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) 2020 Nicole Kleinhoff <ilbelkyr@shalture.org>
+#   Copyright (C) 2020 Daniel Vassdal <shutter@canternet.org>
+#   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+#   Copyright (C) 2019 Anatole Denis <natolumin@rezel.net>
+#   Copyright (C) 2013-2021 Sadie Powell <sadie@witchery.services>
+#   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+#   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+#   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
 #   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>
+#   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+#   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+#   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
 #
 # 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
@@ -26,37 +29,43 @@
 #
 
 
-BEGIN {
-	require 5.8.0;
-	push @INC, '.';
-}
-
+use v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
-use File::Copy ();
-use Socket;
-use Cwd;
-use Getopt::Long;
+use Cwd                   qw(getcwd);
+use File::Basename        qw(basename);
+use File::Copy            ();
+use File::Spec::Functions qw(abs2rel catfile catdir rel2abs);
+use FindBin               qw($RealDir);
+use Getopt::Long          qw(GetOptions);
+use POSIX                 qw(getgid getuid);
 
-# Utility functions for our buildsystem
-use make::utilities;
+use lib $RealDir;
+use make::common;
 use make::configure;
-use make::gnutlscert;
-use make::opensslcert;
-
-###############################################################################################
-#
-#                                 NON-EDITABLE VARIABLES
-#
-###############################################################################################
-
-our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports,
-    $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue,
-    $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port,
-	$opt_system, $opt_uid);
-
-our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir);
+use make::console;
+use make::directive;
+
+my ($opt_binary_dir,
+    $opt_config_dir,
+    $opt_data_dir,
+    $opt_development,
+    $opt_disable_auto_extras,
+    $opt_disable_interactive,
+    $opt_distribution_label,
+    $opt_example_dir,
+    $opt_gid,
+    $opt_log_dir,
+    $opt_manual_dir,
+    $opt_module_dir,
+    $opt_portable,
+    $opt_prefix,
+    $opt_runtime_dir,
+    $opt_script_dir,
+    $opt_socketengine,
+    $opt_system,
+    $opt_uid);
 
 sub list_extras ();
 
@@ -67,43 +76,39 @@ 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,
-	'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-ipv6' => \$opt_noipv6,
-	'with-cc=s' => \$opt_cc,
-	'with-maxbuf=i' => \$opt_maxbuf,
-	'enable-freebsd-ports-openssl' => \$opt_freebsd_port,
-	'prefix=s' => \$opt_base_dir,
-	'config-dir=s' => \$opt_config_dir,
-	'module-dir=s' => \$opt_module_dir,
-	'binary-dir=s' => \$opt_binary_dir,
-	'data-dir=s' => \$opt_data_dir,
-	'log-dir=s' => \$opt_log_dir,
-	'disable-debuginfo' => sub { $opt_disable_debug = 1 },
-	'help'	=> sub { showhelp(); },
-	'update' => sub { update(); },
-	'clean' => sub { 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, # ^
-	'generate-openssl-cert' => sub { make_openssl_cert(); exit(0); },
-	'generate-gnutls-cert' => sub { make_gnutls_cert(); exit(0); }
+exit 1 unless GetOptions(
+	'clean'  => \&cmd_clean,
+	'help'	 => \&cmd_help,
+	'update' => \&cmd_update,
+
+	'binary-dir=s'         => \$opt_binary_dir,
+	'config-dir=s'         => \$opt_config_dir,
+	'data-dir=s'           => \$opt_data_dir,
+	'development'          => \$opt_development,
+	'disable-auto-extras'  => \$opt_disable_auto_extras,
+	'disable-interactive'  => \$opt_disable_interactive,
+	'distribution-label=s' => \$opt_distribution_label,
+	'example-dir=s'        => \$opt_example_dir,
+	'gid=s'                => \$opt_gid,
+	'log-dir=s'            => \$opt_log_dir,
+	'manual-dir=s'         => \$opt_manual_dir,
+	'module-dir=s'         => \$opt_module_dir,
+	'portable'             => \$opt_portable,
+	'prefix=s'             => \$opt_prefix,
+	'runtime-dir=s'        => \$opt_runtime_dir,
+	'script-dir=s'         => \$opt_script_dir,
+	'socketengine=s'       => \$opt_socketengine,
+	'system'               => \$opt_system,
+	'uid=s'                => \$opt_uid,
+
+	'disable-extras=s@' => \@opt_disableextras,
+	'enable-extras=s@'  => \@opt_enableextras,
+	'list-extras'       => sub { list_extras; exit 0; },
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
-	@opt_enableextras = split /,/, join(',', @opt_enableextras);
-	@opt_disableextras = split /,/, join(',', @opt_disableextras);
+	@opt_enableextras = grep { /\S/ } split /[, ]+/, join(',', @opt_enableextras);
+	@opt_disableextras = grep { /\S/ } split /[, ]+/, join(',', @opt_disableextras);
 	enable_extras(@opt_enableextras);
 	disable_extras(@opt_disableextras);
 	list_extras;
@@ -112,959 +117,382 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 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_cc) ||
-	(defined $opt_noipv6) ||
-	(defined $opt_kqueue) ||
-	(defined $opt_epoll) ||
-	(defined $opt_ports) ||
-	(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) ||
-	(defined $opt_freebsd_port)
+	!-t STDIN ||
+	!-t STDOUT ||
+	defined $opt_binary_dir ||
+	defined $opt_config_dir ||
+	defined $opt_data_dir ||
+	defined $opt_development ||
+	defined $opt_disable_auto_extras ||
+	defined $opt_disable_interactive ||
+	defined $opt_distribution_label ||
+	defined $opt_example_dir ||
+	defined $opt_gid ||
+	defined $opt_log_dir ||
+	defined $opt_manual_dir ||
+	defined $opt_module_dir ||
+	defined $opt_portable ||
+	defined $opt_prefix ||
+	defined $opt_runtime_dir ||
+	defined $opt_script_dir ||
+	defined $opt_socketengine ||
+	defined $opt_system ||
+	defined $opt_uid
 );
 
-chomp(our $topdir = getcwd());
-our $this = resolve_directory($topdir);						# PWD, Regardless.
-our @modlist = ();							  		# Declare for Module List..
-our %config = ();						   			# Initiate Configuration Hash..
-our $cache_loaded = getcache();
-$config{ME} = resolve_directory($topdir);				# Present Working Directory
-
-$config{BASE_DIR} ||= $config{ME}."/run";
-
-if (defined $opt_base_dir) {
-	$config{BASE_DIR} = $opt_base_dir;
+my %version = get_version $opt_distribution_label;
+say console_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>";
+
+my %config;
+if ($interactive) {
+	%config = read_config_file(CONFIGURE_CACHE_FILE);
+	run_test abs2rel(CONFIGURE_CACHE_FILE, $RealDir), %config;
+	if (!defined $config{VERSION}) {
+		$config{VERSION} = CONFIGURE_CACHE_VERSION;
+	} elsif ($config{VERSION} != CONFIGURE_CACHE_VERSION) {
+		print_warning "ignoring contents of ${\CONFIGURE_CACHE_FILE} as it was generated by an incompatible version of $0!";
+		%config = ('VERSION', CONFIGURE_CACHE_VERSION);
+	}
+}
+
+$config{CXX} = find_compiler($config{CXX} // $ENV{CXX});
+unless ($config{CXX}) {
+	say 'A suitable C++ compiler could not be detected on your system!';
+	unless ($interactive) {
+		say 'Set the CXX environment variable to the path to a C++ compiler binary if this is incorrect.';
+		exit 1;
+	}
+	until ($config{CXX}) {
+		my $compiler_path = prompt_string 1, 'Please enter the path to a C++ compiler binary:', 'c++';
+		$config{CXX} = find_compiler $compiler_path;
+	}
+}
+my %compiler = get_compiler_info($config{CXX});
+
+$config{HAS_ARC4RANDOM_BUF} = run_test 'arc4random_buf()', test_file($config{CXX}, 'arc4random_buf.cpp');
+$config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', $^O eq 'darwin' ? undef : '-lrt');
+$config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');
+
+my @socketengines;
+push @socketengines, 'epoll'  if run_test 'epoll', test_header $config{CXX}, 'sys/epoll.h';
+push @socketengines, 'kqueue' if run_test 'kqueue', test_file $config{CXX}, 'kqueue.cpp';
+push @socketengines, 'poll'   if run_test 'poll', test_header $config{CXX}, 'poll.h';
+push @socketengines, 'select';
+
+if (defined $opt_socketengine) {
+	unless (grep { $_ eq $opt_socketengine } @socketengines) {
+		my $reason = -f "src/socketengines/socketengine_$opt_socketengine.cpp" ? 'is not available on this platform' : 'does not exist';
+		print_error "The socket engine you requested ($opt_socketengine) $reason!",
+			'Available socket engines are:',
+			map { "  * $_" } @socketengines;
+	}
+}
+$config{SOCKETENGINE} = $opt_socketengine // $socketengines[0];
+
+if (defined $opt_portable) {
+	print_error '--portable and --system can not be used together!' if defined $opt_system;
+	$config{DESTDIR}     = catfile $RealDir, 'run', '';
+	$config{BASE_DIR}    = $opt_prefix      // '';
+	$config{BINARY_DIR}  = $opt_binary_dir  // 'bin';
+	$config{CONFIG_DIR}  = $opt_config_dir  // 'conf';
+	$config{DATA_DIR}    = $opt_data_dir    // 'data';
+	$config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{CONFIG_DIR}, 'examples';
+	$config{LOG_DIR}     = $opt_log_dir     // 'logs';
+	$config{MANUAL_DIR}  = $opt_manual_dir  // 'manuals';
+	$config{MODULE_DIR}  = $opt_module_dir  // 'modules';
+	$config{RUNTIME_DIR} = $opt_runtime_dir // $config{DATA_DIR};
+	$config{SCRIPT_DIR}  = $opt_script_dir  // $config{BASE_DIR};
 } elsif (defined $opt_system) {
-	$config{BASE_DIR} = '/var/lib/inspircd';
-}
-
-if (defined $opt_system) {
-	$config{UID} = $opt_uid || 'ircd';
-	$config{CONFIG_DIR}	 = '/etc/inspircd';
-	$config{MODULE_DIR}	 = '/usr/lib/inspircd';
-	$config{BINARY_DIR}	 = '/usr/sbin/';
-	$config{BUILD_DIR}	 = resolve_directory($config{ME}."/build");         # Build Directory
-	$config{DATA_DIR}	 = '/var/inspircd';
-	$config{LOG_DIR}	 = '/var/log/inspircd';
+	$config{BASE_DIR}    = $opt_prefix      // '/';
+	$config{BINARY_DIR}  = $opt_binary_dir  // catdir $config{BASE_DIR}, 'usr/sbin';
+	$config{CONFIG_DIR}  = $opt_config_dir  // catdir $config{BASE_DIR}, 'etc/inspircd';
+	$config{DATA_DIR}    = $opt_data_dir    // catdir $config{BASE_DIR}, 'var/lib/inspircd';
+	$config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{BASE_DIR}, 'usr/share/doc/inspircd';
+	$config{LOG_DIR}     = $opt_log_dir     // catdir $config{BASE_DIR}, 'var/log/inspircd';
+	$config{MANUAL_DIR}  = $opt_manual_dir  // catdir $config{BASE_DIR}, 'usr/share/man/man1';
+	$config{MODULE_DIR}  = $opt_module_dir  // catdir $config{BASE_DIR}, 'usr/lib/inspircd';
+	$config{RUNTIME_DIR} = $opt_runtime_dir // catdir $config{BASE_DIR}, 'var/run/inspircd';
+	$config{SCRIPT_DIR}  = $opt_script_dir  // catdir $config{BASE_DIR}, 'usr/share/inspircd';
 } else {
-	$config{UID} = $opt_uid || $config{UID} || $<;
-	$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{BUILD_DIR}	 ||= resolve_directory($config{ME}."/build");         # Build Directory
-	$config{DATA_DIR}	 ||= resolve_directory($config{BASE_DIR}."/data");	# Data directory
-	$config{LOG_DIR}	 ||= resolve_directory($config{BASE_DIR}."/logs");	# Log directory
-}
-
-if (defined $opt_config_dir) {
-	$config{CONFIG_DIR} = $opt_config_dir;
-}
-if (defined $opt_module_dir) {
-	$config{MODULE_DIR} = $opt_module_dir;
-}
-if (defined $opt_binary_dir) {
-	$config{BINARY_DIR} = $opt_binary_dir;
-}
-if (defined $opt_data_dir) {
-	$config{DATA_DIR} = $opt_data_dir;
-}
-if (defined $opt_log_dir) {
-	$config{LOG_DIR} = $opt_log_dir;
-}
-chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null`); # GNUTLS Version.
-
-if (defined $opt_freebsd_port)
-{
-	chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`);
-	chomp($config{HAS_OPENSSL_PORT}  = `pkg-config --modversion openssl 2>/dev/null`);
-	$config{USE_FREEBSD_BASE_SSL} = "n";
-}
-else
-{
-	if ($^O eq "freebsd")
-	{
-		# default: use base ssl
-		chomp($config{HAS_OPENSSL} = `openssl version | cut -d ' ' -f 2`);			# OpenSSL version, freebsd specific
-		chomp($config{HAS_OPENSSL_PORT}  = `pkg-config --modversion openssl 2>/dev/null`);	# Port version, may be different
-	}
-	else
-	{
-		chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);		# Openssl version, others
-		$config{HAS_OPENSSL_PORT} = "";
-		$config{USE_FREEBSD_BASE_SSL} = "n";
-	}
-}
-
-chomp(our $gnutls_ver = $config{HAS_GNUTLS});
-chomp(our $openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS}	    ||= "n";
-if (defined $opt_use_gnutls)
-{
-	$config{USE_GNUTLS} = "y";					# Use gnutls.
-}
-$config{USE_OPENSSL}	||= "n";						# Use openssl.
-if (defined $opt_use_openssl)
-{
-	$config{USE_OPENSSL} = "y";
-}
-
-if (!defined $opt_disable_debug) {
-	$config{OPTIMISATI}	 = "-g1";			     	# Optimisation Flag
+	$config{BASE_DIR}    = rel2abs $opt_prefix // $config{BASE_DIR}    // catdir $RealDir,            'run';
+	$config{BINARY_DIR}  = $opt_binary_dir     // $config{BINARY_DIR}  // catdir $config{BASE_DIR},   'bin';
+	$config{CONFIG_DIR}  = $opt_config_dir     // $config{CONFIG_DIR}  // catdir $config{BASE_DIR},   'conf';
+	$config{DATA_DIR}    = $opt_data_dir       // $config{DATA_DIR}    // catdir $config{BASE_DIR},   'data';
+	$config{EXAMPLE_DIR} = $opt_example_dir    // $config{EXAMPLE_DIR} // catdir $config{CONFIG_DIR}, 'examples';
+	$config{LOG_DIR}     = $opt_log_dir        // $config{LOG_DIR}     // catdir $config{BASE_DIR},   'logs';
+	$config{MANUAL_DIR}  = $opt_manual_dir     // $config{MANUAL_DIR}  // catdir $config{BASE_DIR},   'manuals';
+	$config{MODULE_DIR}  = $opt_module_dir     // $config{MODULE_DIR}  // catdir $config{BASE_DIR},   'modules';
+	$config{RUNTIME_DIR} = $opt_runtime_dir    // $config{RUNTIME_DIR} // $config{DATA_DIR};
+	$config{SCRIPT_DIR}  = $opt_script_dir     // $config{SCRIPT_DIR}  // $config{BASE_DIR};
+}
+
+# Parse --gid=123 or --gid=foo and extract the group id.
+my @group;
+if (defined $opt_gid) {
+	@group = $opt_gid =~ /^\d+$/ ? getgrgid($opt_gid) : getgrnam($opt_gid);
+	print_error "there is no '$opt_gid' group on this system!" unless @group;
 } else {
-	$config{OPTIMISATI}	 = "-O2";
-}
-
-$config{HAS_STRLCPY}	= "false";			  		# strlcpy Check.
-$config{HAS_STDINT}	 = "false";					# stdint.h check
-$config{USE_KQUEUE}	 = "y";						# kqueue enabled
-if (defined $opt_nokqueue) {
-	$config{USE_KQUEUE} = "n";
-}
-$config{USE_POLL}     = "y";					# poll enabled
-$config{USE_EPOLL}	  = "y";					# epoll enabled
-if (defined $opt_noepoll)
-{
-	$config{USE_EPOLL} = "n";
-}
-$config{USE_PORTS}	  = "y";					# epoll enabled
-if (defined $opt_noports)
-{
-	$config{USE_PORTS} = "n";
-}
-$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.
-if ($config{OSNAME} =~ /darwin/i)
-{
-	$config{IS_DARWIN} = "YES";
-	$config{STARTSCRIPT}	  = "org.inspircd.plist";		# start script for OSX.
-	$config{CC} 		    = "xcrun clang++";					# C++ compiler for OSX.
-}
-elsif ($config{OSNAME} =~ /freebsd/i)
-{
-	chomp(my $fbsd_version = `uname -r`);
-	$fbsd_version =~ s/^(\d+\.\d+).*/$1/g;
-	$config{CC} = $fbsd_version >= 10.0 ? 'clang++' : 'g++';
-}
-else
-{
-	$config{CC} 		    = "g++";						# C++ compiler
-}
-if (defined $opt_cc)
-{
-	$config{CC} = $opt_cc;
-}
-`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
-$config{GCCVER} = defined $1 ? $1 : '';
-$config{GCCMINOR} = defined $2 ? $2 : '0';
-$config{MAXBUF}			= "512";				# Max buffer size
-
-if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
-	$config{HAS_OPENSSL} = $1;
+	@group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} // getgid());
+	print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group;
+	unless ($group[2]) {
+		print_warning <<"EOW";
+You are building as the privileged $group[0] group and have not specified
+an unprivileged group to run InspIRCd as.
+
+This is almost never what you should do. You should probably either create a new
+unprivileged user/group to build and run as or pass the '--gid [id|name]' flag
+to specify an unprivileged group to run as.
+EOW
+		if (!prompt_bool $interactive, "Are you sure you want to build as the $group[0] group?", 0) {
+			# PACKAGERS: You do not need to delete this check. Use `--gid $(id -g)` or `--gid 0` instead.
+			say STDERR "If you are sure you want to build as the $group[0] group pass the --gid $group[2] flag." unless $interactive;
+			exit 1;
+		}
+	}
+}
+$config{GROUP} = $group[0];
+$config{GID}   = $group[2];
+
+# Parse --uid=123 or --uid=foo and extract the user id.
+my @user;
+if (defined $opt_uid) {
+	@user = $opt_uid =~ /^\d+$/ ? getpwuid($opt_uid) : getpwnam($opt_uid);
+	print_error "there is no '$opt_uid' user on this system!" unless @user;
 } else {
-	$config{HAS_OPENSSL} = "";
-}
-
-if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
-	print "`$config{CC}` was not found! A C++ compiler is required to build InspIRCd!\n";
-	print "You can pass a custom compiler to $0 using --with-cc=[name].\n";
-	exit;
-}
-
-# Get and Set some important vars..
-getmodules();
-
-sub clean
-{
-	unlink(".config.cache");
-}
+	@user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} // getuid());
+	print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user;
+	unless ($user[2]) {
+		print_warning <<"EOW";
+You are building as the privileged $user[0] user and have not specified
+an unprivileged user to run InspIRCd as.
 
-our ($has_epoll, $has_ports, $has_kqueue) = (0, 0, 0);
-
-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";
-			if (defined($opt_disable_debug) && $opt_disable_debug == 1)
-			{
-				print "Disabling debug information (-g).\n";
-				$config{OPTIMISATI} = "";
-			}
-			$has_epoll = $config{HAS_EPOLL};
-			$has_ports = $config{HAS_PORTS};
-			$has_kqueue = $config{HAS_KQUEUE};
-			writefiles(1);
-			makecache();
-			print "Complete.\n";
-			exit;
+This is almost never what you should do. You should probably either create a new
+unprivileged user/group to build and run as or pass the '--uid [id|name]' flag
+to specify an unprivileged user to run as.
+EOW
+		if (!prompt_bool $interactive, "Are you sure you want to build as the $user[0] user?", 0) {
+			# PACKAGERS: You do not need to delete this check. Use `--uid $(id -u)` or `--uid 0` instead.
+			say STDERR "If you are sure you want to build as the $user[0] user pass the --uid $user[2] flag." unless $interactive;
+			exit 1;
 		}
-	};
-	if ($@)
-	{
-		print "Configure update failed: $@\n";
-	}
-	exit;
-}
-
-
-sub test_compile {
-	my $feature = shift;
-	my $fail = 0;
-	$fail ||= system "$config{CC} -o test_$feature make/check_$feature.cpp >/dev/null 2>&1";
-	$fail ||= system "./test_$feature";
-	unlink "test_$feature";
-	return !$fail;
-}
-
-print "Running non-interactive configure...\n" unless $interactive;
-print "Checking for cache from previous configure... ";
-print ($cache_loaded ? "found\n" : "not found\n");
-$config{SYSTEM} = lc $^O;
-print "Checking operating system version... $config{SYSTEM}\n";
-
-`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
-$config{GCCVER} = defined $1 ? $1 : '';
-$config{GCCMINOR} = defined $2 ? $2 : '0';
-
-printf "Checking if stdint.h exists... ";
-$config{HAS_STDINT} = test_compile('stdint');
-print $config{HAS_STDINT} ? "yes\n" : "no\n";
-
-printf "Checking if strlcpy exists... ";
-$config{HAS_STRLCPY} = test_compile('strlcpy');
-print $config{HAS_STRLCPY} ? "yes\n" : "no\n";
-
-printf "Checking if kqueue exists... ";
-$has_kqueue = test_compile('kqueue');
-print $has_kqueue ? "yes\n" : "no\n";
-
-printf "Checking for epoll support... ";
-$has_epoll = test_compile('epoll');
-print $has_epoll ? "yes\n" : "no\n";
-
-printf "Checking for eventfd support... ";
-$config{HAS_EVENTFD} = test_compile('eventfd') ? 'true' : 'false';
-print $config{HAS_EVENTFD} eq 'true' ? "yes\n" : "no\n";
-
-printf "Checking if Solaris I/O completion ports are available... ";
-$has_ports = 0;
-our $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 "yes\n" if $has_ports == 1;
-print "no\n" if $has_ports == 0;
+$config{USER} = $user[0];
+$config{UID}  = $user[2];
 
-$config{HAS_EPOLL} = $has_epoll;
-$config{HAS_KQUEUE} = $has_kqueue;
-
-printf "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";
-	}
-} else {
-	print "no\n";
-	$config{HAS_GNUTLS} = "n";
+# Warn the user about clock drifting when running on OpenVZ.
+if (-e '/proc/user_beancounters' || -e '/proc/vz/vzaquota') {
+	print_warning <<'EOW';
+You are building InspIRCd inside of an OpenVZ container. If you
+plan to use InspIRCd in this container then you should make sure that NTP is
+configured on the Hardware Node. Failure to do so may result in clock drifting!
+EOW
 }
 
-printf "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";
+# Warn the user about OpenBSD shipping incredibly broken compilers/linkers.
+if ($^O eq 'openbsd') {
+	print_warning <<'EOW';
+You are building InspIRCd on OpenBSD. The C++ compilers and linkers
+that OpenBSD ship are incredibly broken. You may have strange linker errors
+and crashes. Please consider using a different OS like FreeBSD/NetBSD instead.
+EOW
+}
+
+# Warn about Perl versions that will not be supported in the future.
+if ($^V lt 'v5.26.0') {
+	print_warning <<"EOW";
+You are building InspIRCd with Perl $^V. This is very old and will
+not be supported by the next major version of InspIRCd. Please consider updating
+to Perl v5.26 or newer.
+EOW
+}
+
+# Warn about compiler versions that will not be supported in the future.
+my %future_compilers = (
+	AppleClang => version->parse('10.0'),
+	Clang      => version->parse('5.0'),
+	GCC        => version->parse('7.0'),
+);
+if (exists $future_compilers{$compiler{NAME}} && $compiler{VERSION} lt $future_compilers{$compiler{NAME}}) {
+	print_warning <<"EOW";
+You are building InspIRCd with $compiler{NAME} v$compiler{VERSION}. This is very old and
+will not be supported by the next major version of InspIRCd. Please consider
+updating to $compiler{NAME} v$future_compilers{$compiler{NAME}} or newer.
+EOW
+}
+
+# Check that the user actually wants this version.
+if (defined $version{REAL_LABEL}) {
+	print_warning <<'EOW';
+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.
+
+You can obtain the latest stable version from https://www.inspircd.org or by
+running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp3)|>` if you are
+installing from Git.
+EOW
+	if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development // 0) {
+		say STDERR 'If you understand this warning and still want to continue pass the --development flag.' unless $interactive;
+		exit 1;
+	}
+}
+
+# Configure directory settings.
+my $question = <<"EOQ";
+Currently, InspIRCd is configured with the following paths:
+
+<|BOLD Binary:|> $config{BINARY_DIR}
+<|BOLD Config:|> $config{CONFIG_DIR}
+<|BOLD Data:|>   $config{DATA_DIR}
+<|BOLD Log:|>    $config{LOG_DIR}
+<|BOLD Manual:|> $config{MANUAL_DIR}
+<|BOLD Module:|> $config{MODULE_DIR}
+<|BOLD Script:|> $config{SCRIPT_DIR}
+
+Do you want to change these settings?
+EOQ
+if (prompt_bool $interactive, $question, 0) {
+	my $original_base_dir = $config{BASE_DIR};
+	$config{BASE_DIR} = prompt_dir $interactive, 'In what directory do you wish to install the InspIRCd base?', $config{BASE_DIR};
+	for my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
+		$config{$key} =~ s/^\Q$original_base_dir\E/$config{BASE_DIR}/;
+	}
+	$config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR};
+	$config{CONFIG_DIR} = prompt_dir $interactive, 'In what directory are configuration files to be stored?', $config{CONFIG_DIR};
+	$config{DATA_DIR}   = prompt_dir $interactive, 'In what directory are variable data files to be stored?', $config{DATA_DIR};
+	$config{LOG_DIR}    = prompt_dir $interactive, 'In what directory are log files to be stored?',           $config{LOG_DIR};
+	$config{MANUAL_DIR} = prompt_dir $interactive, 'In what directory are manual pages to be placed?',        $config{MANUAL_DIR};
+	$config{MODULE_DIR} = prompt_dir $interactive, 'In what directory are modules to be placed?',             $config{MODULE_DIR};
+	$config{SCRIPT_DIR} = prompt_dir $interactive, 'In what directory are scripts to be placed?',             $config{SCRIPT_DIR};
+	$config{EXAMPLE_DIR} = $config{CONFIG_DIR} . '/examples';
+	$config{RUNTIME_DIR} = $config{DATA_DIR};
+}
+
+# Configure module settings.
+$question = <<'EOQ';
+Currently, InspIRCd is configured to automatically enable all available extra modules.
+
+Would you like to enable extra modules manually?
+EOQ
+if (prompt_bool $interactive, $question, 0) {
+	for my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
+		my $module_name = module_shrink $extra;
+		if (prompt_bool $interactive, "Would you like to enable the <|BOLD $module_name|> module?", 0) {
+			enable_extras $module_name;
+		}
+	}
+} elsif (!defined $opt_disable_auto_extras) {
+	my %modules = (
+		'm_argon2.cpp'          => 'pkg-config --exists libargon2',
+		'm_geo_maxmind.cpp'     => 'pkg-config --exists libmaxminddb',
+		'm_mysql.cpp'           => 'mysql_config --version',
+		'm_pgsql.cpp'           => 'pg_config --version',
+		'm_ldap.cpp'            => "echo '#include <ldap.h>' | $config{CXX} -E -",
+		'm_regex_pcre.cpp'      => 'pcre-config --version',
+		'm_regex_posix.cpp'     => undef,
+		'm_regex_re2.cpp'       => 'pkg-config --exists re2',
+		'm_regex_stdlib.cpp'    => "$config{CXX} -o /dev/null -std=c++11 $RealDir/make/test/compiler.cpp",
+		'm_regex_tre.cpp'       => 'pkg-config --exists tre',
+		'm_sqlite3.cpp'         => 'pkg-config --exists sqlite3',
+		'm_ssl_gnutls.cpp'      => 'pkg-config --exists gnutls',
+		'm_ssl_mbedtls.cpp'     => "echo '#include <mbedtls/version.h>' | $config{CXX} -E -",
+		'm_ssl_openssl.cpp'     => 'pkg-config --exists openssl',
+		'm_sslrehashsignal.cpp' => undef,
+	);
+	while (my ($module, $command) = each %modules) {
+		unless (defined $command && system "$command 1>/dev/null 2>/dev/null") {
+			enable_extras $module;
+		}
+	}
+}
+
+# Generate SSL certificates.
+$question = <<EOQ;
+Would you like to generate a self-signed SSL certificate now? This certificate
+can be used for testing but <|BOLD should not|> be used on a production network.
+
+Note: you can get a <|BOLD free|> CA-signed certificate from Let's Encrypt. See
+https://letsencrypt.org/getting-started/ for more details.
+EOQ
+
+if (<$RealDir/src/modules/m_ssl_*.cpp>) {
+	if (prompt_bool $interactive, $question, $interactive) {
+		create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
+		system './tools/genssl', 'auto', CONFIGURE_DIRECTORY;
 	} 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)
-{
-	my $version = `uname -r`;
-	if ($version =~ /^4\./)
-	{
-		print "yes.\n";
-		print "FreeBSD 4.x is no longer supported. By ANYONE.\n";
-		print "To build, you will need to add the following to CXXFLAGS:\n";
-		print "\t-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1\n";
- 	}
-	else
-	{
-		print "no ($version)\n";
-	}
-}
-else
-{
-	print "no ($config{OSNAME})\n";
-}
-
-################################################################################
-#			  BEGIN INTERACTIVE PART			      #
-################################################################################
-
-# Clear the Screen..
-if ($interactive)
-{
-	print "\e[2J\e[0G\e[0d"; # J = Erase in Display, 2 = Entire Screen, (G, d) = Move cursor to (..,..)
-	my $wholeos = $^O;
-
-	my $rev = getrevision();
-	# Display Introduction Message..
-	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 \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: \e[1;32m$config{OSNAME}\e[0m ($wholeos)
-Your InspIRCd revision ID is \e[1;32mr$rev\e[0m
-STOP
-	if ($rev eq "r0") {
-		print " (Non-SVN build)";
-	}
-	print ".\n\n";
-
-	$config{CHANGE_COMPILER} = "n";
-	print "I have detected the following compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n";
-
-	while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) {
-		print "\e[1;32mIMPORTANT!\e[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 "[\e[1;32m$config{CC}\e[0m] -> ";
-			chomp($config{CC} = <STDIN>);
-			if ($config{CC} eq "") {
-				$config{CC} = "g++";
-			}
-			chomp(my $foo = `$config{CC} -dumpversion | cut -c 1`);
-			if ($foo ne "") {
-				`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
-				$config{GCCVER} = defined $1 ? $1 : '';
-				$config{GCCMINOR} = defined $2 ? $2 : '0';
-				print "Queried compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n";
-				if ($config{GCCVER} < 3) {
-					print "\e[1;32mGCC 2.x WILL NOT WORK!\e[0m. Let's try that again, shall we?\n";
-				}
-			}
-			else {
-				print "\e[1;32mWARNING!\e[0m Could not execute the compiler you specified. You may want to try again.\n";
-			}
-		}
-	}
-
-	print "\n";
-
-	# Directory Settings..
-	my $tmpbase = $config{BASE_DIR};
-	dir_check("do you wish to install the InspIRCd base", "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{DATA_DIR}	 = resolve_directory($config{BASE_DIR}."/data");	# Data Directory
-		$config{LOG_DIR}	 = resolve_directory($config{BASE_DIR}."/logs");	# Log Directory
-		$config{BINARY_DIR}	 = resolve_directory($config{BASE_DIR}."/bin");	    # Binary Directory
-	}
+		my @pems = <${\CONFIGURE_DIRECTORY}/{cert,csr,dhparams,key}.pem>;
+		$question = <<EOQ;
+The following self-signed files were previously generated and will be installed
+when you run Make. Do you want to delete them?
 
-	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 variable data files to be located in", "DATA_DIR");
-	dir_check("are the logs to be stored in", "LOG_DIR");
-	dir_check("do you want the build to take place", "BUILD_DIR");
-		
-	my $chose_hiperf = 0;
-	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 ($config{USE_KQUEUE} eq "y") {
-			$chose_hiperf = 1;
+  * ${\join "\n  * ", @pems}
+EOQ
+		if (@pems && prompt_bool $interactive, $question, 0) {
+			unlink @pems;
 		}
 	}
-	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 ($config{USE_EPOLL} eq "y") {
-			$chose_hiperf = 1;
-		}
-	}
-	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";
-		if ($config{USE_PORTS} eq "y") {
-			$chose_hiperf = 1;
-		}
-	}
-
-	if (!$chose_hiperf) {
-		yesno('USE_POLL', "Would you like to use poll?\n This is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?");
-		if ($config{USE_POLL} ne "y")
-		{
-			print "No high-performance socket engines are available, or you chose\n";
-			print "not to enable one. Defaulting to select() engine.\n\n";
-		}
-	}
-
-	$config{USE_FREEBSD_BASE_SSL} = "n";
-	$config{USE_FREEBSD_PORTS_SSL} = "n";
-	if ($config{HAS_OPENSSL_PORT} ne "")
-	{
-		$config{USE_FREEBSD_PORTS_SSL} = "y";
-		print "I have detected the OpenSSL FreeBSD port installed on your system,\n";
-		print "version \e[1;32m".$config{HAS_OPENSSL_PORT}."\e[0m. Your base system OpenSSL is version \e[1;32m".$openssl_ver."\e[0m.\n\n";
-		yesno('USE_FREEBSD_PORTS_SSL', "Do you want to use the FreeBSD ports version?");
-		print "\n";
-		$config{USE_FREEBSD_BASE_SSL} = "y" if ($config{USE_FREEBSD_PORTS_SSL} eq "n");
-
-		if ($config{USE_FREEBSD_BASE_SSL} eq "n")
-		{
-			# update to port version
-			$openssl_ver = $config{HAS_OPENSSL_PORT};
-		}
-	}
-	else
-	{
-		$config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd");
-	}
-
-	$config{USE_SSL} ||= "n";
-	$config{MODUPDATE} ||= 'n';
-
-	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";
-
-		yesno('USE_SSL', "One or more SSL libraries detected. Would you like to enable SSL support?");
-		if ($config{USE_SSL} eq "y")
-		{
-			if ($config{HAS_GNUTLS} eq "y")
-			{
-				yesno('USE_GNUTLS',"Would you like to enable SSL with m_ssl_gnutls? (recommended)");
-				if ($config{USE_GNUTLS} eq "y")
-				{
-					print "\nUsing GnuTLS SSL module.\n";
-				}
-			}
-
-			if ($config{HAS_OPENSSL} eq "y")
-			{
-				yesno('USE_OPENSSL', "Would you like to enable SSL with m_ssl_openssl?");
-				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";
-				}
-			}
-		}
-	}
-	else
-	{
-		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
-		print "is in your path.\n\n";
-	}
-
-	yesno('MODUPDATE',"Would you like to check for updates to third-party modules?");
-	print "\n";
-	if ($config{MODUPDATE} eq "y") {
-		print "Checking for upgrades to extra and third-party modules... ";
-		system "./modulemanager upgrade";
-	}
-}
-
-# 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";
-
-dumphash();
+} elsif (!defined $opt_disable_auto_extras) {
+	print_warning <<"EOM";
+You are building without enabling any SSL modules. This is not
+recommended as SSL greatly enhances the security and privacy of your IRC server
+and in a future version will be <|BOLD required|> for linking servers.
 
-if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
-{
-	print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-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 pkg-config and openssl are in your path.\n";
-	exit(0);
-}
-our $failed = 0;
+Please read the following documentation pages on how to enable SSL support:
 
-$config{CERTGEN} ||= 'y';
-yesno('CERTGEN',"Would you like to generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
-
-if ($config{USE_GNUTLS} eq "y") {
-	unless (-r "src/modules/m_ssl_gnutls.cpp") {
-		print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
-		symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!";
-	}
-	if ($interactive && $config{CERTGEN} eq 'y')
-	{
-		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
-			print "SSL certificates not found, generating.. \n\n
-*************************************************************
-* Generating the private key may take some time, once done, *
-* answer the questions which follow. If you are unsure,     *
-* just hit enter!                                           *
-*************************************************************\n\n";
-			$failed = make_gnutls_cert();
-			if ($failed) {
-				print "\n\e[1;32mCertificate generation failed!\e[0m\n\n";
-			} else {
-				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";
-				print "Done.\n\n";
-			}
-		}
-		else {
-			print "SSL certificates found, skipping.\n\n";
-		}
-	}
-	else
-	{
-		print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
-	}
+GnuTLS (recommended): https://docs.inspircd.org/3/modules/ssl_gnutls
+mbedTLS:              https://docs.inspircd.org/3/modules/ssl_mbedtls
+OpenSSL:              https://docs.inspircd.org/3/modules/ssl_openssl
+EOM
 }
 
-if ($config{USE_OPENSSL} eq "y") {
-	unless (-r "src/modules/m_ssl_openssl.cpp") {
-		print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
-		symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!";
-	}
-	$failed = 0;
-	if ($interactive && $config{CERTGEN} eq 'y')
-	{
-		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
-			print "SSL certificates not found, generating.. \n\n
-*************************************************************
-* 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... ";
-			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";
-		} else {
-			print "SSL certificates found, skipping.\n\n"
-		}
-	}
-	else
-	{
-		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 as SSL support is not available.\n\n";
-}
-
-depcheck();
-writefiles(1);
-makecache();
-
-print "\n\n";
-print "To build your server with these settings, please run '\e[1;32mmake\e[0m' now.\n";
-if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
-	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\n";
-if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) {
-	print "\e[1;32mWARNING!\e[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";
-}
+# Cache the distribution label so that its not lost when --update is run.
+$config{DISTRIBUTION} = $opt_distribution_label if $opt_distribution_label;
 
-if ($config{GCCVER} < "3") {
-	print <<FOO2;
-\e[1;32mWARNING!\e[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
-}
+write_configure_cache %config;
+parse_templates \%config, \%compiler, \%version;
 
-if ($^O eq 'openbsd') {
-	print <<__OPENBSD_WARNING__;
-\e[1;32mWARNING!\e[0m OpenBSD 6.5 changed Make to no longer look for BSDmakefile when
-searching for the makefile. If the version of OpenBSD you are using is 6.5 or
-newer then you will need to run '\e[1;32mmake -f BSDmakefile\e[0m' or '\e[1;32mgmake\e[0m' instead.
-__OPENBSD_WARNING__
-}
+print console_format <<"EOM";
 
-################################################################################
-#			      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;
-	}
-	close(CACHE);
-	return 1;
-}
+Configuration is complete! You have chosen to build with the following settings:
 
-sub makecache {
-	# Dump the contents of %config
-	print "Writing \e[1;32mcache file\e[0m for future ./configures ...\n";
-	open(FILEHANDLE, ">.config.cache");
-	foreach my $key (keys %config) {
-		print FILEHANDLE "$key=\"$config{$key}\"\n";
-	}
-	close(FILEHANDLE);
-}
+<|GREEN Compiler:|>
+  <|GREEN Binary:|>  $config{CXX}
+  <|GREEN Name:|>    $compiler{NAME}
+  <|GREEN Version:|> $compiler{VERSION}
 
-sub dir_check {
-	my ($desc, $hash_key) = @_;
-	my $complete = 0;
-	while (!$complete) {
-		print "In what directory $desc?\n";
-		print "[\e[1;32m$config{$hash_key}\e[0m] -> ";
-		chomp(my $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 "/"))
-		{
-			# Assume relative Path was given.. fill in the rest.
-			$var = $this . "/$var";
-		}
+<|GREEN Extra Modules:|>
+EOM
 
-		$var = resolve_directory($var);
-		if (! -e $var) {
-			print "$var does not exist. Create it?\n[\e[1;32my\e[0m] ";
-			chomp(my $tmp = <STDIN>);
-			if (($tmp eq "") || ($tmp =~ /^y/i)) {
-				# Attempt to Create the Dir..
-				my $chk = eval {
-					use File::Path ();
-					File::Path::mkpath($var, 0, 0777);
-					1;
-				};
-				unless (defined($chk) && -d $var) {
-					print "Unable to create directory. ($var)\n\n";
-					# Restart Loop..
-					next;
-				}
-			} 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";
-	}
+for my $file (<$RealDir/src/modules/m_*>) {
+	say "  * ${\module_shrink $file}" if -l $file;
 }
 
-our $SHARED = "";
-
-my ($mliflags, $mfrules, $mobjs, $mfcount) = ("", "", "", 0);
-
-sub writefiles {
-	my($writeheader) = @_;
-	# First File.. inspircd_config.h
-	chomp(my $incos = `uname -n -s -r`);
-	chomp(my $version = `sh src/version.sh`);
-	chomp(my $revision2 = getrevision());
-	my $branch = "InspIRCd-0.0";
-	if ($version =~ /^(InspIRCd-[0-9]+\.[0-9]+)\.[0-9]+/)
-	{
-		$branch = $1;
-	}
-	if ($writeheader == 1)
-	{
-		print "Writing \e[1;32minspircd_config.h\e[0m\n";
-		open(FILEHANDLE, ">include/inspircd_config.h.tmp");
-		print FILEHANDLE <<EOF;
-/* Auto generated by configure, do not modify! */
-#ifndef INSPIRCD_CONFIG_H
-#define INSPIRCD_CONFIG_H
-
-/* this is for windows support. */
-#define CoreExport /**/
-#define DllExport /**/
-
-#define CONFIG_PATH "$config{CONFIG_DIR}"
-#define DATA_PATH "$config{DATA_DIR}"
-#define LOG_PATH "$config{LOG_DIR}"
-#define MOD_PATH "$config{MODULE_DIR}"
-#define SOMAXCONN_S "$config{_SOMAXCONN}"
-#define ENTRYPOINT int main(int argc, char** argv)
-
-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{HAS_EVENTFD} eq 'true') {
-			print FILEHANDLE "#define HAS_EVENTFD\n";
-		}
-		if ($config{OSNAME} !~ /DARWIN/i) {
-			print FILEHANDLE "#define HAS_CLOCK_GETTIME\n";
-		} else {
-			print FILEHANDLE "#ifdef MAC_OS_X_VERSION_10_12\n";
-			print FILEHANDLE "# define HAS_CLOCK_GETTIME\n";
-			print FILEHANDLE "#endif\n";
-		}
-		my $use_hiperf = 0;
-		if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-			print FILEHANDLE "#define USE_KQUEUE\n";
-			$config{SOCKETENGINE} = "socketengine_kqueue";
-			$use_hiperf = 1;
-		}
-		if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-			print FILEHANDLE "#define USE_EPOLL\n";
-			$config{SOCKETENGINE} = "socketengine_epoll";
-			$use_hiperf = 1;
-		}
-		if (($has_ports) && ($config{USE_PORTS} eq "y")) {
-			print FILEHANDLE "#define USE_PORTS\n";
-			$config{SOCKETENGINE} = "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 "no hi-perf, " . $config{USE_POLL};
-			if ($config{USE_POLL} eq "y")
-			{
-				print FILEHANDLE "#define USE_POLL\n";
-				$config{SOCKETENGINE} = "socketengine_poll";
-			}
-			else
-			{
-				print FILEHANDLE "#define USE_SELECT\n";
-				$config{SOCKETENGINE} = "socketengine_select";
-			}
-		}
-		print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
-		close(FILEHANDLE);
-
-		open(FILEHANDLE, ">include/inspircd_version.h.tmp");
-		print FILEHANDLE <<EOF;
-#define BRANCH "$branch"
-#define VERSION "$version"
-#define REVISION "$revision2"
-#define SYSTEM "$incos"
-EOF
-		close FILEHANDLE;
-
-		for my $file (qw(include/inspircd_config.h include/inspircd_version.h)) {
-			my $diff = 0;
-			open my $fh1, $file or $diff = 1;
-			open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
-			while (!$diff) {
-				my $line1 = <$fh1>;
-				my $line2 = <$fh2>;
-				if (defined($line1) != defined($line2)) {
-					$diff = 1;
-				} elsif (!defined $line1) {
-					last;
-				} else {
-					$diff = ($line1 ne $line2);
-				}
-			}
-			if ($diff) {
-				unlink $file;
-				rename "$file.tmp", $file;
-			} else {
-				unlink "$file.tmp";
-			}
-		}
-	}
-
-	# 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.
+my @makeargs;
+push @makeargs, "-C${\abs2rel $RealDir}" unless getcwd eq $RealDir;
+push @makeargs, "-j${\(get_cpu_count() + 1)}";
 
-	chomp($version = `sh ./src/version.sh`);
-	chomp(my $revision = getrevision());
-	$version = "$version(r$revision)";
+print console_format <<"EOM";
 
-	# We can actually parse any file starting with . and ending with .inc,
-	# but right now we only parse .inspircd.inc to form './inspircd'
-	prepare_dynamic_makefile();
+<|GREEN Paths:|>
+  <|GREEN Binary:|>  $config{BINARY_DIR}
+  <|GREEN Config:|>  $config{CONFIG_DIR}
+  <|GREEN Data:|>    $config{DATA_DIR}
+  <|GREEN Example:|> $config{EXAMPLE_DIR}
+  <|GREEN Log:|>     $config{LOG_DIR}
+  <|GREEN Manual:|>  $config{MANUAL_DIR}
+  <|GREEN Module:|>  $config{MODULE_DIR}
+  <|GREEN Runtime:|> $config{RUNTIME_DIR}
+  <|GREEN Script:|>  $config{SCRIPT_DIR}
 
-	my @dotfiles = qw(main.mk inspircd);
-	push @dotfiles, 'org.inspircd.plist' if $config{OSNAME} eq 'darwin';
-
-	# HACK: we need to know if we are on GCC6 to disable the omission of `this` null pointer checks.
-	$config{GCC6} = `$config{CC} --version 2>/dev/null` =~ /gcc/i && $config{GCCVER} ge "6" ? "true" : "false";
-
-	foreach my $file (@dotfiles) {
-		open(FILEHANDLE, "make/template/$file") or die "Can't open make/template/$file: $!";
-		$_ = join '', <FILEHANDLE>;
-		close(FILEHANDLE);
-
-		$config{BUILD_DIR} ||= resolve_directory($config{ME}."/build");
-
-		for my $var (qw(
-			CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
-			STARTSCRIPT DESTINATION SOCKETENGINE LOG_DIR GCC6
-		)) {
-			s/\@$var\@/$config{$var}/g;
-		}
-		s/\@EXECUTABLE\@/$exe/ if defined $exe;
-		s/\@VERSION\@/$version/ if defined $version;
-
-		if ($file eq 'main.mk') {
-			print "Writing \e[1;32mGNUmakefile\e[0m ...\n";
-
-			my $mk_tmp = $_;
-			s/\@IFDEF (\S+)/ifdef $1/g;
-			s/\@IFNDEF (\S+)/ifndef $1/g;
-			s/\@IFEQ (\S+) (\S+)/ifeq ($1,$2)/g;
-			s/\@ELSIFEQ (\S+) (\S+)/else ifeq ($1,$2)/g;
-			s/\@ELSE/else/g;
-			s/\@ENDIF/endif/g;
-			s/ *\@BSD_ONLY .*\n//g;
-			s/\@GNU_ONLY //g;
-			s/\@DO_EXPORT (.*)/export $1/g;
-			open MKF, '>GNUmakefile' or die "Can't write to GNUmakefile: $!";
-			print MKF $_;
-			close MKF;
-
-			print "Writing \e[1;32mBSDmakefile\e[0m ...\n";
-			$_ = $mk_tmp;
-			s/\@IFDEF (\S+)/.if defined($1)/g;
-			s/\@IFNDEF (\S+)/.if !defined($1)/g;
-			s/\@IFEQ (\S+) (\S+)/.if $1 == $2/g;
-			s/\@ELSIFEQ (\S+) (\S+)/.elif $1 == $2/g;
-			s/\@ELSE/.else/g;
-			s/\@ENDIF/.endif/g;
-			s/\@BSD_ONLY //g;
-			s/ *\@GNU_ONLY .*\n//g;
-			$mk_tmp = $_;
-			$mk_tmp =~ s#\@DO_EXPORT (.*)#"MAKEENV += ".join ' ', map "$_='\${$_}'", split /\s/, $1#eg;
-			open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!";
-			print MKF $mk_tmp;
-			close MKF;
-		} else {
-			print "Writing \e[1;32m$file\e[0m ...\n";
-			open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n");
-			print FILEHANDLE $_;
-			close(FILEHANDLE);
-		}
-	}
-
-	chmod 0755, 'inspircd';
-}
-
-sub depcheck
-{
-	getmodules();
-	for my $mod (@modlist) {
-		getcompilerflags("src/modules/m_$mod.cpp");
-		getlinkerflags("src/modules/m_$mod.cpp");
-	}
-}
+<|GREEN Execution Group:|> $config{GROUP} ($config{GID})
+<|GREEN Execution User:|>  $config{USER} ($config{UID})
+<|GREEN Socket Engine:|>   $config{SOCKETENGINE}
 
-sub prepare_dynamic_makefile
-{
-	my $i = 0;
+To build with these settings run '<|GREEN make ${\join ' ', @makeargs} install|>' now.
 
-	if (!$has_epoll)
-	{
-		$config{USE_EPOLL} = 0;
-	}
-	if (!$has_kqueue)
-	{
-		$config{USE_KQUEUE} = 0;
-	}
-	if (!$has_ports)
-	{
-		$config{USE_PORTS} = 0;
-	}
-}
+EOM
 
 # 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
@@ -1086,7 +514,7 @@ sub list_extras () {
 	my @sources = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
 	closedir $dd;
 	undef $dd;
-	my $maxlen = (sort { $b <=> $a } (map {length($_)} (@extras)))[0];
+	my $maxlen = (sort { $b <=> $a } (map { length module_shrink $_ } (@extras)))[0];
 	my %extras = ();
 EXTRA:	for my $extra (@extras) {
 		next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra);
@@ -1129,7 +557,7 @@ EXTRA:	for my $extra (@extras) {
 	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 / +/, getdependencies($abs_extra);
+		my @deps = split /\s+/, get_directive($abs_extra, 'ModDep', '');
 		for my $dep (@deps) {
 			if (exists($extras{$dep})) {
 				my $ref = \$extras{$dep}; # Take reference.
@@ -1154,76 +582,64 @@ EXTRA:	for my $extra (@extras) {
 	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/ ? ")" : "");
+			printf "\e[31;1;5m%-*s = %s%s\e[0m\n", $maxlen, module_shrink($extra), $text, ($text =~ m/needed by/ ? ")" : "");
 		} else {
-			printf "%-*s = %s%s\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? "\e[0m)" : "");
+			printf "%-*s = %s%s\n", $maxlen, module_shrink($extra), $text, ($text =~ m/needed by/ ? "\e[0m)" : "");
 		}
 	}
 	return keys(%extras) if wantarray; # Can be used by manage_extras.
 }
 
-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;
-		}
-		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;
+sub enable_extras(@) {
+	my $moduledir = catdir $RealDir, 'src', 'modules';
+	my $extradir = catdir $moduledir, 'extra';
+
+	for my $extra (@_) {
+		my $shortname = module_shrink $extra;
+		my $extrafile = module_expand $extra;
+
+		my $extrapath = catfile $extradir, $extrafile;
+		if (!-f $extrapath) {
+			print_error "<|GREEN $extra|> is not an extra module!";
 		}
-		# Get dependencies, and add them to be processed.
-		my @deps = split / +/, getdependencies($extrapath);
-		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") {
-				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";
-				}
+
+		my $modulepath = catfile $moduledir, $extrafile;
+		if (-l $modulepath) {
+			if (readlink($modulepath) ne $extrapath) {
+				unlink $modulepath; # Remove the dead symlink.
+			} else {
+				next; # Module is already enabled.
 			}
 		}
-		print "Enabling $extra ... \n";
-		symlink "extra/$extra", $source or print STDERR "$source: Cannot link to 'extra/$extra': $!\n";
+
+		if (-e $modulepath) {
+			print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: the target exists and is not a symlink.";
+		} else {
+			say console_format "Enabling the <|GREEN $shortname|> module ...";
+			symlink $extrapath, $modulepath or print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: $!";
+		}
 	}
 }
 
-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 / +/, getdependencies("src/modules/extra/$file");
-			# 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;
-				}
-			}
+sub disable_extras(@) {
+	my $moduledir = catdir $RealDir, 'src', 'modules';
+	my $extradir = catdir $moduledir, 'extra';
+
+	for my $extra (@_) {
+		my $shortname = module_shrink $extra;
+		my $extrafile = module_expand $extra;
+
+		my $modulepath = catfile $moduledir, $extrafile;
+		my $extrapath = catfile $extradir, $extrafile;
+		if (!-e $modulepath && !-e $extrapath) {
+			print_error "the <|GREEN $shortname|> module does not exist!";
+		} elsif (!-e $modulepath && -e $extrapath) {
+			print_error "the <|GREEN $shortname|> module is not currently enabled!";
+		} elsif ((-e $modulepath && !-e $extrapath) || !-l $modulepath) {
+			print_error "the <|GREEN $shortname|> module is not an extra module!";
+		} else {
+			say console_format "Disabling the <|GREEN $shortname|> module ...";
+			unlink $modulepath or print_error "unable to unlink <|GREEN $extrapath|>: $!";
 		}
-		# Now remove.
-		print "Disabling $extra ... \n";
-		unlink "src/modules/$extra" or print STDERR "Cannot disable \e[32;1m$extra\e[0m : $!\n";
 	}
 }