Merge pull request #895 from SaberUK/master+configure-misc-cleanup

Various improvements to the build system.

13 files changed, 573 insertions, 513 deletions

diff --git a/.gitignore b/.gitignore
index 8b09fdb5e..ca364ecfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,9 @@
 *.pem
 *.swp
 
-/.config.cache
-/.gdbargs
-/.modulemanager
+.*
+!.git*
+
 /BSDmakefile
 /GNUmakefile
 /build
diff --git a/configure b/configure
index 45bb0e911..c4f0dffc7 100755
--- a/configure
+++ b/configure
@@ -33,17 +33,29 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);
 
-use File::Copy ();
+use File::Basename        qw(basename);
+use File::Copy            ();
 use File::Spec::Functions qw(rel2abs);
-use Cwd;
-use Getopt::Long;
+use Getopt::Long          qw(GetOptions);
+use POSIX                 qw(getgid getuid);
 
+use make::common;
 use make::configure;
-use make::utilities;
-
-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);
+use make::console;
+
+my ($opt_binary_dir,
+    $opt_config_dir,
+    $opt_data_dir,
+    $opt_disable_interactive,
+    $opt_distribution_label,
+    $opt_gid,
+    $opt_log_dir,
+    $opt_manual_dir,
+    $opt_module_dir,
+    $opt_prefix,
+    $opt_socketengine,
+    $opt_system,
+    $opt_uid);
 
 sub list_extras ();
 
@@ -54,25 +66,29 @@ sub disable_extras (@);
 my @opt_enableextras;
 my @opt_disableextras;
 
-GetOptions (
-	'enable-gnutls' => \$opt_use_gnutls,
-	'system' => \$opt_system,
-	'uid=s' => \$opt_uid,
-	'enable-openssl' => \$opt_use_openssl,
-	'disable-interactive' => \$opt_nointeractive,
-	'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,
-	'data-dir=s' => \$opt_data_dir,
-	'log-dir=s' => \$opt_log_dir,
-	'help'	=> \&cmd_help,
+GetOptions(
+	'clean'  => \&cmd_clean,
+	'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, # ^
+
+	'disable-interactive'  => \$opt_disable_interactive,
+	'distribution-label=s' => \$opt_distribution_label,
+	'binary-dir=s'         => \$opt_binary_dir,
+	'config-dir=s'         => \$opt_config_dir,
+	'data-dir=s'           => \$opt_data_dir,
+	'gid=s'                => \$opt_gid,
+	'log-dir=s'            => \$opt_log_dir,
+	'manual-dir=s'         => \$opt_manual_dir,
+	'module-dir=s'         => \$opt_module_dir,
+	'prefix=s'             => \$opt_prefix,
+	'socketengine=s'       => \$opt_socketengine,
+	'system'               => \$opt_system,
+	'uid=s'                => \$opt_uid,
+
+	# TODO: when the modulemanager rewrite is done these should be removed.
+	'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) {
@@ -86,100 +102,45 @@ 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_socketengine) ||
-	(defined $opt_use_openssl) ||
-	(defined $opt_system) ||
-	(defined $opt_uid) ||
-	(defined $opt_use_gnutls)
+	!-t STDIN ||
+	!-t STDOUT ||
+	defined $opt_binary_dir ||
+	defined $opt_config_dir ||
+	defined $opt_data_dir ||
+	defined $opt_disable_interactive ||
+	defined $opt_distribution_label ||
+	defined $opt_gid ||
+	defined $opt_log_dir ||
+	defined $opt_manual_dir ||
+	defined $opt_module_dir ||
+	defined $opt_prefix ||
+	defined $opt_socketengine ||
+	defined $opt_system ||
+	defined $opt_uid
 );
 
-our %config = read_configure_cache();
-
-print "Checking for cache from previous configure... ";
-print %config ? "found\n" : "not found\n";
-
-$config{BASE_DIR} = getcwd()."/run";
-
-if (defined $opt_base_dir) {
-	$config{BASE_DIR} = $opt_base_dir;
-} elsif (defined $opt_system) {
-	$config{BASE_DIR} = '/var/lib/inspircd';
-}
-
-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) {
-	$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`);
-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}	= 0;						# Use openssl.
-if (defined $opt_use_openssl)
-{
-	$config{USE_OPENSSL} = "y";
+my %version = get_version();
+print_format "<|BOLD Configuring InspIRCd $version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL} on $^O.|>\n";
+
+our %config;
+if ($interactive) {
+	%config = read_configure_cache();
+	run_test CONFIGURE_CACHE_FILE, %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} = 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";
+$config{CXX} = find_compiler($config{CXX} || $ENV{CXX});
+unless ($config{CXX}) {
+	print "A suitable C++ compiler could not be detected on your system!\n";
+	print "Set the CXX environment variable to the compiler binary path if this is incorrect.\n";
 	exit 1;	
 }
-
-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{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
-	$config{HAS_OPENSSL} = $1;
-} else {
-	$config{HAS_OPENSSL} = "";
-}
+my %compiler = get_compiler_info($config{CXX});
 
 $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');
@@ -202,10 +163,10 @@ if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) {
 
 # Select is available on all platforms
 $config{HAS_SELECT} = 1;
-$config{SOCKETENGINE} ||= "select";
+$config{SOCKETENGINE} ||= 'select';
 
 if (defined $opt_socketengine) {
-	my $cfgkey = "HAS_" . uc $opt_socketengine;
+	my $cfgkey = 'HAS_' . uc $opt_socketengine;
 	if ($config{$cfgkey} && -f "src/socketengines/socketengine_$opt_socketengine.cpp") {
 		$config{SOCKETENGINE} = $opt_socketengine;
 	} else {
@@ -213,221 +174,165 @@ if (defined $opt_socketengine) {
 		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 " $1" if $config{'HAS_' . uc $1};
 		}
 		print "\n";	
 		exit 1;
 	}
 }
 
-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";
-	}
+# If the user has specified a distribution label then we use it in
+# place of the label from src/version.sh or Git.
+if (defined $opt_distribution_label) {
+	$version{LABEL} = $opt_distribution_label;
+}
+
+if (defined $opt_system) {
+	$config{BASE_DIR}   = $opt_prefix     || '/var/lib/inspircd';
+	$config{BINARY_DIR} = $opt_binary_dir || '/usr/sbin';
+	$config{CONFIG_DIR} = $opt_config_dir || '/etc/inspircd';
+	$config{DATA_DIR}   = $opt_data_dir   || '/var/inspircd';
+	$config{LOG_DIR}    = $opt_module_dir || '/var/log/inspircd';
+	$config{MANUAL_DIR} = $opt_manual_dir || '/usr/share/man/man1';
+	$config{MODULE_DIR} = $opt_module_dir || '/usr/lib/inspircd';
 } else {
-	print "no\n";
-	$config{HAS_GNUTLS} = "n";
+	$config{BASE_DIR}   = $opt_prefix     || $config{BASE_DIR}   || rel2abs 'run';
+	$config{BINARY_DIR} = $opt_binary_dir || $config{BINARY_DIR} || rel2abs $config{BASE_DIR} . '/bin';
+	$config{CONFIG_DIR} = $opt_config_dir || $config{CONFIG_DIR} || rel2abs $config{BASE_DIR} . '/conf';
+	$config{DATA_DIR}   = $opt_data_dir   || $config{DATA_DIR}   || rel2abs $config{BASE_DIR} . '/data';
+	$config{LOG_DIR}    = $opt_log_dir    || $config{LOG_DIR}    || rel2abs $config{BASE_DIR} . '/logs';
+	$config{MANUAL_DIR} = $opt_manual_dir || $config{MANUAL_DIR} || rel2abs $config{BASE_DIR} . '/manuals';
+	$config{MODULE_DIR} = $opt_module_dir || $config{MODULE_DIR} || rel2abs $config{BASE_DIR} . '/modules';
 }
 
-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";
-	}
+# 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 {
-	print "no\n";
-	$config{HAS_OPENSSL} = "n";
+	@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;
 }
+$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 {
+	@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;
+}
+$config{USER} = $user[0];
+$config{UID}  = $user[2];
 
-if ($interactive)
-{
-	# Clear the screen.
-	system 'tput', 'clear';
-
-	my %version = get_version();
-
-	# 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$^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";
-
-	# 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
+# Clear the screen.
+system 'tput', 'clear' if $interactive;
+
+# Check that the user actually wants this version.
+if ($version{LABEL} ne 'release' && $interactive) {
+	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://github.com/inspircd/inspircd/releases
-or by running `git checkout insp20` if you are installing from Git.
+You can obtain the latest stable version from http://www.inspircd.org/ or by
+running `git checkout insp20` if you are installing from Git.
 
 EOW
-	exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0);
-	}
+exit 1 unless prompt_bool $interactive, 'I understand this warning and want to continue anyway.', !$interactive;
+}
 
-	# Directory Settings..
-	my $tmpbase = $config{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} = 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");
+# Configure directory settings.
+my $question = <<"EOQ";
+Currently, InspIRCd is configured with the following paths:
+
+<|BOLD Base:|>   $config{BASE_DIR}
+<|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}
+
+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};
+	foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_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{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});
-
-	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;
-		}
-	}
-	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;
-		}
-	}
-	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;
+# 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) {
+	foreach my $extra (<src/modules/extra/m_*.cpp>) {
+		my $module_name = basename $extra, '.cpp';
+		if (prompt_bool $interactive, "Would you like to enable $module_name?", 0) {
+			enable_extras "$module_name.cpp";
 		}
 	}
+} else {
+	# TODO: finish modulemanager rewrite and replace this code with:
+	# system './modulemanager', 'enable', '--auto';
+	enable_extras 'm_ssl_gnutls.cpp' unless system 'gnutls-cli --version >/dev/null 2>&1';
+	enable_extras 'm_ssl_openssl.cpp' unless system 'openssl --version >/dev/null 2>&1';
+}
 
-	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";
-		}
-	}
-	unless ($chose_hiperf || $config{USE_POLL})
-	{
-		print "No high-performance socket engines are available, or you chose not to enable one. Defaulting to select() engine.\n\n";
-		$config{SOCKETENGINE} = "select";
-	}
+# Generate SSL certificates.
+if (<src/modules/m_ssl_*.cpp> && prompt_bool $interactive, 'Would you like to generate SSL certificates now?', $interactive) {
+	system './tools/genssl', 'auto';
+}
 
-	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";
-
-		$config{USE_SSL} = prompt_bool(1, 'One or more SSL libraries detected. Would you like to enable SSL support?', 1);
-		if ($config{USE_SSL})
-		{
-			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";
-				}
-			}
+write_configure_cache %config if $interactive;
+parse_templates \%config, \%compiler, \%version;
 
-			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";
-				}
-			}
-		}
-	}
-	else
-	{
-		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
-		print "is in your path.\n\n";
-	}
-}
+print_format <<"EOM";
 
-# 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";
+Configuration is complete! You have chosen to build with the following settings:
 
-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;
-}
+<|GREEN Compiler:|>
+  <|GREEN Binary:|>  $config{CXX}
+  <|GREEN Name:|>    $compiler{NAME}
+  <|GREEN Version:|> $compiler{VERSION}
 
-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";
-			}
-		} else {
-			print "SSL certificates found, skipping.\n\n"
-		}
-	} else {
-		print "Skipping SSL certificate generation in non-interactive mode.\n\n";
-	}
-} else {
-	print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
-}
+<|GREEN Extra Modules:|> <<TODO>>
+  * m_foo
+  * m_bar
+  * m_baz
 
-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";
+<|GREEN Paths:|>
+  <|GREEN Base:|>   $config{BASE_DIR}
+  <|GREEN Binary:|> $config{BINARY_DIR}
+  <|GREEN Config:|> $config{CONFIG_DIR}
+  <|GREEN Data:|>   $config{DATA_DIR}
+  <|GREEN Log:|>    $config{LOG_DIR}
+  <|GREEN Manual:|> $config{MANUAL_DIR}
+  <|GREEN Module:|> $config{MODULE_DIR}
+
+<|GREEN Execution Group:|> $config{GROUP} ($config{GID})
+<|GREEN Execution User:|>  $config{USER} ($config{UID})
+<|GREEN Socket Engine:|>   $config{SOCKETENGINE}
+
+To build with these settings run '<|GREEN make -j${\get_cpu_count}|>' now.
+
+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
diff --git a/make/common.pm b/make/common.pm
new file mode 100644
index 000000000..24ef599ce
--- /dev/null
+++ b/make/common.pm
@@ -0,0 +1,91 @@
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2013-2014 Peter Powell <petpow@saberuk.com>
+#
+# 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.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+BEGIN {
+	require 5.8.0;
+}
+
+package make::common;
+
+use strict;
+use warnings FATAL => qw(all);
+
+use Exporter              qw(import);
+use File::Spec::Functions qw(rel2abs);
+
+our @EXPORT = qw(get_cpu_count
+                 get_version
+                 module_installed);
+
+my %version;
+
+sub get_version {
+	return %version if %version;
+
+	# Attempt to retrieve version information from src/version.sh
+	chomp(my $vf = `sh src/version.sh 2>/dev/null`);
+	if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
+		%version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
+	}
+
+	# Attempt to retrieve missing version information from Git
+	chomp(my $gr = `git describe --tags 2>/dev/null`);
+	if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) {
+		$version{MAJOR} = $1 unless defined $version{MAJOR};
+		$version{MINOR} = $2 unless defined $version{MINOR};
+		$version{PATCH} = $3 unless defined $version{PATCH};
+		$version{LABEL} = $4 if defined $4;
+	}
+
+	# The user is using a stable release which does not have
+	# a label attached.
+	$version{LABEL} = 'release' unless defined $version{LABEL};
+
+	# If any of these fields are missing then the user has deleted the
+	# version file and is not running from Git. Fill in the fields with
+	# dummy data so we don't get into trouble with undef values later.
+	$version{MAJOR} = '0' unless defined $version{MAJOR};
+	$version{MINOR} = '0' unless defined $version{MINOR};
+	$version{PATCH} = '0' unless defined $version{PATCH};
+
+	return %version;
+}
+
+sub module_installed($) {
+	my $module = shift;
+	eval("use $module;");
+	return !$@;
+}
+
+sub get_cpu_count {
+	my $count = 1;
+	if ($^O =~ /bsd/) {
+		$count = `sysctl -n hw.ncpu`;
+	} elsif ($^O eq 'darwin') {
+		$count = `sysctl -n hw.activecpu`;
+	} elsif ($^O eq 'linux') {
+		$count = `getconf _NPROCESSORS_ONLN`;
+	} elsif ($^O eq 'solaris') {
+		$count = `psrinfo -p`;
+	}
+	chomp($count);
+	return $count;
+}
+
+1;
diff --git a/make/configure.pm b/make/configure.pm
index 905233835..8653edaac 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -30,19 +30,33 @@ package make::configure;
 use strict;
 use warnings FATAL => qw(all);
 
-use Cwd 'getcwd';
-use Exporter 'import';
-use File::Basename 'basename';
+use Cwd            qw(getcwd);
+use Exporter       qw(import);
+use File::Basename qw(basename);
 
+use make::common;
+use make::console;
 use make::utilities;
 
-our @EXPORT = qw(cmd_clean cmd_help cmd_update
-                 read_configure_cache write_configure_cache
-                 get_compiler_info find_compiler
-                 run_test test_file test_header
-                 dump_hash get_property parse_templates);
-
-sub __get_socketengines() {
+use constant CONFIGURE_CACHE_FILE    => '.configure.cache';
+use constant CONFIGURE_CACHE_VERSION => '1';
+
+our @EXPORT = qw(CONFIGURE_CACHE_FILE
+                 CONFIGURE_CACHE_VERSION
+                 cmd_clean
+                 cmd_help
+                 cmd_update
+                 run_test
+                 test_file
+                 test_header
+                 read_configure_cache
+                 write_configure_cache
+                 get_compiler_info
+                 find_compiler
+                 get_property
+                 parse_templates);
+
+sub __get_socketengines {
 	my @socketengines;
 	foreach (<src/socketengines/socketengine_*.cpp>) {
 		s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
@@ -53,12 +67,12 @@ sub __get_socketengines() {
 
 # TODO: when buildtool is done this can be mostly removed with
 #       the remainder being merged into parse_templates.
-sub __get_template_settings($$) {
+sub __get_template_settings($$$) {
 
 	# These are actually hash references
-	my ($config, $compiler) = @_;
+	my ($config, $compiler, $version) = @_;
 
-	# Start off by populating with the config
+	# Start off by populating with the config
 	my %settings = %$config;
 
 	# Compiler information
@@ -67,12 +81,12 @@ sub __get_template_settings($$) {
 	}
 
 	# Version information
-	my %version = get_version();
-	while (my ($key, $value) = each %version) {
+	while (my ($key, $value) = each %{$version}) {
 		$settings{'VERSION_' . $key} = $value;
 	}
 
 	# Miscellaneous information
+	$settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE;
 	$settings{SYSTEM_NAME} = lc $^O;
 	chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`);
 
@@ -80,7 +94,7 @@ sub __get_template_settings($$) {
 }
 
 sub cmd_clean {
-	unlink '.config.cache';
+	unlink CONFIGURE_CACHE_FILE;
 }
 
 sub cmd_help {
@@ -111,11 +125,11 @@ PATH OPTIONS
                                 [$PWD/run/data]
   --log-dir=[dir]               The location where the log files are stored.
                                 [$PWD/run/logs]
+  --manual-dir=[dir]            The location where the manual files are stored.
+                                [$PWD/run/manuals]
   --module-dir=[dir]            The location where the loadable modules are
                                 stored.
                                 [$PWD/run/modules]
-  --build-dir=[dir]             The location to store files in while building.
-
 
 EXTRA MODULE OPTIONS
 
@@ -129,10 +143,13 @@ MISC OPTIONS
   --clean                       Remove the configuration cache file and start
                                 the interactive configuration wizard.
   --disable-interactive         Disables the interactive configuration wizard.
+  --distribution-label=[text]   Sets a distribution specific version label in
+                                the build configuration.
+  --gid=[id|name]               Sets the group to run InspIRCd as.
   --help                        Show this message and exit.
-  --uid=[name]                  Sets the user to run InspIRCd as.
   --socketengine=[name]         Sets the socket engine to be used. Possible
                                 values are $SELIST.
+  --uid=[id|name]               Sets the user to run InspIRCd as.
   --update                      Updates the build environment.
 
 
@@ -150,106 +167,88 @@ EOH
 }
 
 sub cmd_update {
-	unless (-f '.config.cache') {
-		print "You have not run $0 before. Please do this before trying to update the build files.\n";
-		exit 1;
-	}
+	print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f CONFIGURE_CACHE_FILE;
 	print "Updating...\n";
 	my %config = read_configure_cache();
 	my %compiler = get_compiler_info($config{CXX});
-	parse_templates(\%config, \%compiler);
+	my %version = get_version();
+	parse_templates(\%config, \%compiler, \%version);
 	print "Update complete!\n";
 	exit 0;
 }
 
+sub run_test($$) {
+	my ($what, $result) = @_;
+	print_format "Checking whether <|GREEN $what|> is available ... ";
+	print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n";
+	return $result;
+}
+
+sub test_file($$;$) {
+	my ($compiler, $file, $args) = @_;
+	my $status = 0;
+	$args ||= '';
+	$status ||= system "$compiler -o __test_$file make/test/$file $args >/dev/null 2>&1";
+	$status ||= system "./__test_$file >/dev/null 2>&1";
+	unlink "./__test_$file";
+	return !$status;
+}
+
+sub test_header($$;$) {
+	my ($compiler, $header, $args) = @_;
+	$args ||= '';
+	open(COMPILER, "| $compiler -E - $args >/dev/null 2>&1") or return 0;
+	print COMPILER "#include <$header>";
+	close(COMPILER);
+	return !$?;
+}
+
 sub read_configure_cache {
-	my %cfg = ();
-	open(CACHE, '.config.cache') or return %cfg;
+	my %config;
+	open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
 	while (my $line = <CACHE>) {
 		next if $line =~ /^\s*($|\#)/;
 		my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
-		$cfg{$key} = $value;
+		$config{$key} = $value;
 	}
 	close(CACHE);
-	return %cfg;
+	return %config;
 }
 
 sub write_configure_cache(%) {
-	my %cfg = @_;
-	open(CACHE, ">.config.cache") or return 0;
-	while (my ($key, $value) = each %cfg) {
-		$value = "" unless defined $value;
+	print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n";
+	my %config = @_;
+	open(CACHE, '>', CONFIGURE_CACHE_FILE) or print_error "unable to write ${\CONFIGURE_CACHE_FILE}: $!";
+	while (my ($key, $value) = each %config) {
+		$value = '' unless defined $value;
 		print CACHE "$key=\"$value\"\n";
 	}
 	close(CACHE);
-	return 1;
 }
 
 sub get_compiler_info($) {
 	my $binary = shift;
 	my $version = `$binary -v 2>&1`;
-	if ($version =~ /(?:clang|llvm)\sversion\s(\d+\.\d+)/i) {
-		return (
-			NAME => 'Clang',
-			VERSION => $1,
-			UNSUPPORTED => $1 lt '3.0',
-			REASON => 'Clang 2.9 and older do not have adequate C++ support.'
-		);
+	if ($version =~ /clang\sversion\s(\d+\.\d+)/i || $version =~ /^apple.+\(based\son\sllvm\s(\d+\.\d+)/i) {
+		# Apple version their LLVM releases slightly differently to the mainline LLVM.
+		# See https://trac.macports.org/wiki/XcodeVersionInfo for more information.
+		return (NAME => 'Clang', VERSION => $1);
 	} elsif ($version =~ /gcc\sversion\s(\d+\.\d+)/i) {
-		return (
-			NAME => 'GCC',
-			VERSION => $1,
-			UNSUPPORTED => $1 lt '4.1',
-			REASON => 'GCC 4.0 and older do not have adequate C++ support.'
-		);
+		return (NAME => 'GCC', VERSION => $1);
 	} elsif ($version =~ /(?:icc|icpc)\sversion\s(\d+\.\d+).\d+\s\(gcc\sversion\s(\d+\.\d+).\d+/i) {
-		return (
-			NAME => 'ICC',
-			VERSION => $1,
-			UNSUPPORTED => $2 lt '4.1',
-			REASON => "ICC $1 (GCC $2 compatibility mode) does not have adequate C++ support."
-		);
+		return (NAME => 'ICC', VERSION => $1);
 	}
-	return (
-		NAME => $binary,
-		VERSION => '0.0'
-	);
+	return (NAME => $binary, VERSION => '0.0');
 }
 
 sub find_compiler {
-	foreach my $compiler ('c++', 'g++', 'clang++', 'icpc') {
-		return $compiler unless system "$compiler -v > /dev/null 2>&1";
-		if ($^O eq 'Darwin') {
-			return $compiler unless system "xcrun $compiler -v > /dev/null 2>&1";
+	my @compilers = qw(c++ g++ clang++ icpc);
+	foreach my $compiler (shift || @compilers) {
+		return $compiler if run_test "`$compiler`", test_file $compiler, 'compiler.cpp';
+		if ($^O eq 'darwin') {
+			return $compiler if run_test "`xcrun $compiler`", test_file "xcrun $compiler", 'compiler.cpp';
 		}
 	}
-	return "";
-}
-
-sub run_test($$) {
-	my ($what, $result) = @_;
-	print "Checking whether $what is available... ";
-	print $result ? "yes\n" : "no\n";
-	return $result;
-}
-
-sub test_file($$;$) {
-	my ($cc, $file, $args) = @_;
-	my $status = 0;
-	$args ||= '';
-	$status ||= system "$cc -o __test_$file make/test/$file $args >/dev/null 2>&1";
-	$status ||= system "./__test_$file >/dev/null 2>&1";
-	unlink  "./__test_$file";
-	return !$status;
-}
-
-sub test_header($$;$) {
-	my ($cc, $header, $args) = @_;
-	$args ||= '';
-	open(CC, "| $cc -E - $args >/dev/null 2>&1") or return 0;
-	print CC "#include <$header>";
-	close(CC);
-	return !$?;
 }
 
 sub get_property($$;$)
@@ -267,31 +266,18 @@ sub get_property($$;$)
 	return defined $default ? $default : '';
 }
 
-sub dump_hash() {
-	print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n";
-	print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
-	print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
-	print "\e[0mData path:\e[1;32m\t\t\t$main::config{DATA_DIR}\e[0m\n";
-	print "\e[0mLog path:\e[1;32m\t\t\t$main::config{LOG_DIR}\e[0m\n";
-	print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
-	print "\e[0mCompiler:\e[1;32m\t\t\t$main::cxx{NAME} $main::cxx{VERSION}\e[0m\n";
-	print "\e[0mSocket engine:\e[1;32m\t\t\t$main::config{SOCKETENGINE}\e[0m\n";
-	print "\e[0mGnuTLS support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
-	print "\e[0mOpenSSL support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n";
-}
-
-sub parse_templates($$) {
+sub parse_templates($$$) {
 
 	# These are actually hash references
-	my ($config, $compiler) = @_;
+	my ($config, $compiler, $version) = @_;
 
 	# Collect settings to be used when generating files
-	my %settings = __get_template_settings($config, $compiler);
+	my %settings = __get_template_settings($config, $compiler, $version);
 
 	# Iterate through files in make/template.
 	foreach (<make/template/*>) {
-		print "Parsing $_...\n";
-		open(TEMPLATE, $_);
+		print_format "Parsing <|GREEN $_|> ...\n";
+		open(TEMPLATE, $_) or print_error "unable to read $_: $!";
 		my (@lines, $mode, @platforms, %targets);
 
 		# First pass: parse template variables and directives.
@@ -302,9 +288,9 @@ sub parse_templates($$) {
 			while ($line =~ /(@(\w+?)@)/) {
 				my ($variable, $name) = ($1, $2);
 				if (defined $settings{$name}) {
-					$line =~ s/$variable/$settings{$name}/;
+					$line =~ s/\Q$variable\E/$settings{$name}/;
 				} else {
-					print STDERR "Warning: unknown template variable '$name' in $_!\n";
+					print_warning "unknown template variable '$name' in $_!";
 					last;
 				}
 			}
@@ -328,7 +314,7 @@ sub parse_templates($$) {
 						$targets{DEFAULT} = $2;
 					}
 				} else {
-					print STDERR "Warning: unknown template command '$1' in $_!\n";
+					print_warning "unknown template command '$1' in $_!";
 					push @lines, $line;
 				}
 				next;
@@ -413,7 +399,7 @@ sub parse_templates($$) {
 							# HACK: silently ignore if lower case as these are probably make commands.
 							push @final_lines, $line;
 						} else {
-							print STDERR "Warning: unknown template command '$1' in $_!\n";
+							print_warning "unknown template command '$1' in $_!";
 							push @final_lines, $line;
 						}
 						next;
@@ -423,8 +409,8 @@ sub parse_templates($$) {
 				}
 
 				# Write the template file.
-				print "Writing $target...\n";
-				open(TARGET, ">$target");
+				print_format "Writing <|GREEN $target|> ...\n";
+				open(TARGET, '>', $target) or print_error "unable to write $_: $!";
 				foreach (@final_lines) {
 					print TARGET $_, "\n";
 				}
diff --git a/make/console.pm b/make/console.pm
new file mode 100644
index 000000000..9be5ef47c
--- /dev/null
+++ b/make/console.pm
@@ -0,0 +1,113 @@
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+#   Copyright (C) 2014 Peter Powell <petpow@saberuk.com>
+#
+# 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.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+package make::console;
+
+BEGIN {
+	require 5.8.0;
+}
+
+use strict;
+use warnings FATAL => qw(all);
+
+use File::Path            qw(mkpath);
+use File::Spec::Functions qw(rel2abs);
+use Exporter              qw(import);
+
+our @EXPORT = qw(print_format
+                 print_error
+                 print_warning
+                 prompt_bool
+                 prompt_dir
+                 prompt_string);
+
+my %FORMAT_CODES = (
+	DEFAULT => "\e[0m",
+	BOLD    => "\e[1m",
+
+	RED    => "\e[1;31m",
+	GREEN  => "\e[1;32m",
+	YELLOW => "\e[1;33m",
+	BLUE   => "\e[1;34m"
+);
+
+sub __console_format($$) {
+	my ($name, $data) = @_;
+	return $data unless -t STDOUT;
+	return $FORMAT_CODES{uc $name} . $data . $FORMAT_CODES{DEFAULT};
+}
+
+sub print_format($;$) {
+	my $message = shift;
+	my $stream = shift || *STDOUT;
+	while ($message =~ /(<\|(\S+)\s(.+?)\|>)/) {
+		my $formatted = __console_format $2, $3;
+		$message =~ s/\Q$1\E/$formatted/;
+	}
+	print { $stream } $message;
+}
+
+sub print_error($) {
+	my $message = shift;
+	print_format "<|RED Error:|> $message\n", *STDERR;
+	exit 1;
+}
+
+sub print_warning($) {
+	my $message = shift;
+	print_format "<|YELLOW Warning:|> $message\n", *STDERR;
+}
+
+sub prompt_bool($$$) {
+	my ($interactive, $question, $default) = @_;
+	my $answer = prompt_string($interactive, $question, $default ? 'y' : 'n');
+	return $answer =~ /y/i;
+}
+
+sub prompt_dir($$$) {
+	my ($interactive, $question, $default) = @_;
+	my ($answer, $create);
+	do {
+		$answer = rel2abs(prompt_string($interactive, $question, $default));
+		$create = prompt_bool($interactive && !-d $answer, "$answer does not exist. Create it?", 'y');
+		if ($create) {
+			my $mkpath = eval {
+				mkpath($answer, 0, 0750);
+				return 1;
+			};
+			unless (defined $mkpath) {
+				print_warning "unable to create $answer!\n";
+				$create = 0;
+			}
+		}
+	} while (!$create);
+	return $answer;
+}
+
+sub prompt_string($$$) {
+	my ($interactive, $question, $default) = @_;
+	return $default unless $interactive;
+	print_format "$question\n";
+	print_format "[<|GREEN $default|>] => ";
+	chomp(my $answer = <STDIN>);
+	print "\n";
+	return $answer ? $answer : $default;
+}
+
+1;
diff --git a/make/template/main.mk b/make/template/main.mk
index 5806d568a..b4d77e4e6 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -43,6 +43,7 @@ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
 PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
+MANPATH = "$(DESTDIR)@MANUAL_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
 DATPATH = "$(DESTDIR)@DATA_DIR@"
 BINPATH = "$(DESTDIR)@BINARY_DIR@"
@@ -53,7 +54,10 @@ INSTMODE_BIN = 0750
 INSTMODE_LIB = 0640
 
 @IFNEQ $(COMPILER) ICC
-  CORECXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute
+  CORECXXFLAGS += -Woverloaded-virtual -Wshadow
+@IFNEQ $(SYSTEM) openbsd
+    CORECXXFLAGS += -pedantic -Wformat=2 -Wmissing-format-attribute
+@ENDIF
 @ENDIF
 
 @IFNEQ $(SYSTEM)-$(COMPILER) darwin-GCC
@@ -225,6 +229,7 @@ install: target
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
 @IFNDEF PURE_STATIC
@@ -238,10 +243,11 @@ install: target
 @IFEQ $(SYSTEM) linux
 	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null
 @ENDIF
-	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(BASE) 2>/dev/null
-	-$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(BASE) 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+	-$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH)
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
 	@echo ""
@@ -258,7 +264,10 @@ install: target
 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
 	@echo 'Examples are available at:' $(CONPATH)/examples/
 
-GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure .config.cache
+@TARGET BSD_MAKE CONFIGURE_CACHE_FILE = @CONFIGURE_CACHE_FILE@
+@TARGET GNU_MAKE CONFIGURE_CACHE_FILE = $(wildcard @CONFIGURE_CACHE_FILE@)
+
+GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure $(CONFIGURE_CACHE_FILE)
 	./configure -update
 @TARGET BSD_MAKE .MAKEFILEDEPS: BSDmakefile
 
@@ -273,17 +282,23 @@ clean:
 deinstall:
 	-rm -f $(BINPATH)/inspircd
 	-rm -rf $(CONPATH)/examples
+	-rm -f $(MANPATH)/inspircd.1
+	-rm -f $(MANPATH)/inspircd-genssl.1
 	-rm -f $(MODPATH)/*.so
 	-rm -f $(BASE)/.gdbargs
+	-rm -f $(BASE)/inspircd.service
 	-rm -f $(BASE)/org.inspircd.plist
 
 configureclean:
-	rm -f .config.cache
 	rm -f BSDmakefile
 	rm -f GNUmakefile
 	rm -f include/config.h
 	rm -f inspircd
+	rm -f inspircd.1
+	rm -f inspircd-genssl.1
+	-rm -f inspircd.service
 	-rm -f org.inspircd.plist
+	-rm -f @CONFIGURE_CACHE_FILE@
 
 distclean: clean configureclean
 	-rm -rf $(SOURCEPATH)/run
diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist
index 4bcb3e7c3..07a3446b5 100644
--- a/make/template/org.inspircd.plist
+++ b/make/template/org.inspircd.plist
@@ -23,6 +23,8 @@
 	<key>ServiceIPC</key>
 	<false/>
 	<key>UserName</key>
-	<string>ircdaemon</string>
+	<string>@USER@</string>
+	<key>GroupName</key>
+	<string>@GROUP@</string>
 </dict>
 </plist>
diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp
new file mode 100644
index 000000000..1c3e1d875
--- /dev/null
+++ b/make/test/compiler.cpp
@@ -0,0 +1,29 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <iostream>
+#if defined _LIBCPP_VERSION
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+#endif
+
+int main() {
+	std::cout << "Hello, World!" << std::endl;
+	return 0;
+}
diff --git a/make/utilities.pm b/make/utilities.pm
index 7db557d11..dc286da5e 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -32,101 +32,12 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use Fcntl;
 use File::Path;
-use File::Spec::Functions qw(rel2abs);
 use Getopt::Long;
 use POSIX;
 
-our @EXPORT = qw(get_version module_installed prompt_bool prompt_dir prompt_string get_cpu_count make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
+our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
 
 my %already_added = ();
-my %version = ();
-
-sub get_version {
-	return %version if %version;
-
-	# Attempt to retrieve version information from src/version.sh
-	chomp(my $vf = `sh src/version.sh 2>/dev/null`);
-	if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
-		%version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
-	}
-
-	# Attempt to retrieve missing version information from Git
-	chomp(my $gr = `git describe --tags 2>/dev/null`);
-	if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-(\w+))?$/) {
-		$version{MAJOR} = $1 unless defined $version{MAJOR};
-		$version{MINOR} = $2 unless defined $version{MINOR};
-		$version{PATCH} = $3 unless defined $version{PATCH};
-		$version{LABEL} = $4 if defined $4;
-	}
-
-	# The user is using a stable release which does not have
-	# a label attached.
-	$version{LABEL} = 'release' unless defined $version{LABEL};
-
-	# If any of these fields are missing then the user has deleted the
-	# version file and is not running from Git. Fill in the fields with
-	# dummy data so we don't get into trouble with undef values later.
-	$version{MAJOR} = '0' unless defined $version{MAJOR};
-	$version{MINOR} = '0' unless defined $version{MINOR};
-	$version{PATCH} = '0' unless defined $version{PATCH};
-
-	return %version;
-}
-
-sub module_installed($) {
-	my $module = shift;
-	eval("use $module;");
-	return !$@;
-}
-
-sub prompt_bool($$$) {
-	my ($interactive, $question, $default) = @_;
-	my $answer = prompt_string($interactive, $question, $default ? 'y' : 'n');
-	return $answer =~ /y/i;
-}
-
-sub prompt_dir($$$) {
-	my ($interactive, $question, $default) = @_;
-	my ($answer, $create) = (undef, 'y');
-	do {
-		$answer = rel2abs(prompt_string($interactive, $question, $default));
-		$create = prompt_bool($interactive && !-d $answer, "$answer does not exist. Create it?", 'y');
-		my $mkpath = eval {
-			mkpath($answer, 0, 0750);
-			return 1;
-		};
-		unless (defined $mkpath) {
-			print "Error: unable to create $answer!\n\n";
-			$create = 0;
-		}
-	} while (!$create);
-	return $answer;
-}
-
-sub prompt_string($$$) {
-	my ($interactive, $question, $default) = @_;
-	return $default unless $interactive;
-	print $question, "\n";
-	print "[\e[1;32m$default\e[0m] => ";
-	chomp(my $answer = <STDIN>);
-	print "\n";
-	return $answer ? $answer : $default;
-}
-
-sub get_cpu_count {
-	my $count = 1;
-	if ($^O =~ /bsd/) {
-		$count = `sysctl -n hw.ncpu`;
-	} elsif ($^O eq 'darwin') {
-		$count = `sysctl -n hw.activecpu`;
-	} elsif ($^O eq 'linux') {
-		$count = `getconf _NPROCESSORS_ONLN`;
-	} elsif ($^O eq 'solaris') {
-		$count = `psrinfo -p`;
-	}
-	chomp($count);
-	return $count;
-}
 
 sub promptstring($$$$$)
 {
diff --git a/modulemanager b/modulemanager
index 86f9ca0c4..ee281d7fa 100755
--- a/modulemanager
+++ b/modulemanager
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => qw(all);
 
-use make::utilities;
+use make::common;
 
 BEGIN {
 	unless (module_installed("LWP::Simple")) {
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 3dd8a8544..a0c30bb9e 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -31,6 +31,13 @@
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+// Fix warnings about the use of `long long` on C++03.
+#if defined __clang__
+# pragma clang diagnostic ignored "-Wc++11-long-long"
+#elif defined __GNUC__
+# pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
diff --git a/tools/genssl b/tools/genssl
index 073caa8f4..13b1f01fc 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -35,6 +35,7 @@ use File::Temp();
 
 sub prompt($$) {
 	my ($question, $default) = @_;
+	return prompt_string(1, $question, $default) if eval 'use make::console; 1';
 	print "$question\n";
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
diff --git a/tools/test-build b/tools/test-build
index 7f1bf68cd..85d63ccbe 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -29,8 +29,8 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);
 
+use make::common;
 use make::configure;
-use make::utilities;
 
 $ENV{D} = $ENV{V} = 1;