X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=d7cf0d732917a1e02e0b6c6053933ca2d24039be;hb=bdaccea9600285febd1fabc3dddb6dbec9947f42;hp=3c50fcd7d5e8aeb6b4171d10bf76fc4311030494;hpb=8692ce1b65bd38c41f36fdbb7fa2000b1ce03639;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 3c50fcd7d..d7cf0d732 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_freebsd_port,
-     $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,26 +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,
-	'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,
-	'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, # ^
+GetOptions(
+	'clean'  => \&cmd_clean,
+	'help'	 => \&cmd_help,
+	'update' => \&cmd_update,
+
+	'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) {
@@ -87,209 +102,71 @@ 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) ||
-	(defined $opt_freebsd_port)
+	!-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 $topdir = getcwd();
-our @modlist = ();
-our %config = ();
-our $cache_loaded = getcache();
-
-$config{BASE_DIR} = $topdir."/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} = $opt_uid || 'ircd';
-	$config{CONFIG_DIR} = '/etc/inspircd';
-	$config{MODULE_DIR} = '/usr/lib/inspircd';
-	$config{BINARY_DIR} = '/usr/sbin/';
-	$config{BUILD_DIR} = $topdir."/build";
-	$config{DATA_DIR} = '/var/inspircd';
-	$config{LOG_DIR} = '/var/log/inspircd';
-} else {
-	$config{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{BUILD_DIR} = rel2abs($topdir."/build");
-	$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`); # GNUTLS Version.
+my %version = get_version();
+print_format "<|BOLD Configuring InspIRCd $version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL} on $^O.|>\n";
 
-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} = "";
+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);
 	}
 }
 
-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";
-}
-
-$config{STARTSCRIPT} = $^O eq 'darwin' ? 'org.inspircd.plist' : 'inspircd';
-
-$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;	
 }
+my %compiler = get_compiler_info($config{CXX});
 
-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;
-}
+$config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', '-lrt');
+$config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');
 
-if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
-	$config{HAS_OPENSSL} = $1;
-} else {
-	$config{HAS_OPENSSL} = "";
+if ($config{HAS_EPOLL} = run_test 'epoll', test_header($config{CXX}, 'sys/epoll.h')) {
+	$config{SOCKETENGINE} ||= 'epoll';
 }
 
-# Get and Set some important vars..
-getmodules();
-
-sub clean
-{
-	unlink(".config.cache");
-}
-
-sub update
-{
-	eval {
-		# 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 1;
-		} else {
-			# We've Loaded the cache file and all our variables..
-			$topdir = getcwd();
-			getmodules();
-			print "Updating files...\n";
-			%cxx = get_compiler_info($config{CXX});
-			writefiles();
-			makecache();
-			print "Complete.\n";
-			exit;
-		}
-	};
-	if ($@)
-	{
-		print "Configure update failed: $@\n";
-	}
-	exit;
+if ($config{HAS_KQUEUE} = run_test 'kqueue', test_file($config{CXX}, 'kqueue.cpp')) {
+	$config{SOCKETENGINE} ||= 'kqueue';
 }
 
-print "Running non-interactive configure...\n" unless $interactive;
-print "Checking for cache from previous configure... ";
-print ($cache_loaded ? "found\n" : "not found\n");
-
-print "Checking whether clock_gettime() is available... ";
-if (test_file($config{CXX}, "clock_gettime.cpp", "-lrt")) {
-	$config{HAS_CLOCK_GETTIME} = "true";
-	print "yes\n";
-} else {
-	$config{HAS_CLOCK_GETTIME} = "false";
-	print "no\n";
+if ($config{HAS_PORTS} = run_test 'Solaris IOCP', test_header($config{CXX}, 'port.h')) {
+	$config{SOCKETENGINE} ||= 'ports';
 }
 
-print "Checking whether eventfd() is available... ";
-if (test_file($config{CXX}, "eventfd.cpp")) {
-	$config{HAS_EVENTFD} = "true";
-	print "yes\n";
-} else {
-	$config{HAS_EVENTFD} = "false";
-	print "no\n";
+if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) {
+	$config{SOCKETENGINE} ||= 'poll';
 }
 
-print "Checking whether epoll is available... ";
-$config{HAS_EPOLL} = test_header($config{CXX}, "sys/epoll.h");
-print $config{HAS_EPOLL} ? "yes\n" : "no\n";
-$config{SOCKETENGINE} ||= "epoll" if $config{HAS_EPOLL};
-
-print "Checking whether Kqueue is available... ";
-$config{HAS_KQUEUE} = test_file($config{CXX}, "kqueue.cpp");
-print $config{HAS_KQUEUE} ? "yes\n" : "no\n";
-$config{SOCKETENGINE} ||= "kqueue" if $config{HAS_KQUEUE};
-
-print 'Checking whether Solaris IOCP is available... ';
-$config{HAS_PORTS} = test_header($config{CXX}, 'port.h');
-print $config{HAS_PORTS} ? "yes\n" : "no\n";
-$config{SOCKETENGINE} ||= "ports" if $config{HAS_PORTS};
-
-print 'Checking whether poll is available... ';
-$config{HAS_POLL} = test_header($config{CXX}, 'poll.h');
-print $config{HAS_POLL} ? "yes\n" : "no\n";
-$config{SOCKETENGINE} ||= "poll" if $config{HAS_POLL};
-
 # 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 {
@@ -297,468 +174,170 @@ 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";
-	}
-} 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;
 }
 
-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";
-	}
+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_OPENSSL} = "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';
+}
+
+# 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 {
+	@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];
 
-if ($interactive)
-{
-	# Clear the screen.
-	system 'tput', 'clear';
-
-	my $revision = getrevision();
-	chomp(my $version = `sh src/version.sh`);
-
-	# 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 $revision eq 'release' ? substr($version, 9) : substr($revision, 1);
-	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";
-
-	# 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} = rel2abs($config{BASE_DIR}."/conf");
-		$config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
-		$config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
-		$config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
-		$config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
-	}
-
-	dir_check("are the configuration files", "CONFIG_DIR");
-	dir_check("are the modules to be compiled to", "MODULE_DIR");
-	dir_check("is the IRCd binary to be placed", "BINARY_DIR");
-	dir_check("are 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 ($config{HAS_KQUEUE}) {
-		$config{USE_KQUEUE} = "y";
-		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") {
-			$config{SOCKETENGINE} = "kqueue";
-			$chose_hiperf = 1;
-		}
-	}
-	if ($config{HAS_EPOLL}) {
-		$config{USE_EPOLL} = "y";
-		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") {
-			$config{SOCKETENGINE} = "epoll";
-			$chose_hiperf = 1;
-		}
-	}
-	if ($config{HAS_PORTS}) {
-		$config{USE_PORTS} = "y";
-		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") {
-			$config{SOCKETENGINE} = "ports";
-			$chose_hiperf = 1;
-		}
-	}
-
-	if (!$chose_hiperf && $config{HAS_POLL}) {
-		$config{USE_POLL} = "y";
-		yesno('USE_POLL', "Would you like to use poll?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?");
-		if ($config{USE_POLL} eq "y") {
-			$config{SOCKETENGINE} = "poll";
-		}
-	}
-	if (!$chose_hiperf && $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{SOCKETENGINE} = "select";
-	}
-
-	$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";
-
-	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.\n";
-				}
-			}
+# 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];
+
+# 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 http://www.inspircd.org/ or by
+running `git checkout insp20` if you are installing from Git.
+
+EOW
+exit 1 unless prompt_bool $interactive, 'I understand this warning and want to continue anyway.', !$interactive;
+}
+
+# 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};
+}
+
+# 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
-	{
-		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
-		print "is in your path.\n\n";
-	}
+} 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';
 }
 
-# We are on a POSIX system, we can enable POSIX extras without asking
-symlink "extra/m_regex_posix.cpp", "src/modules/m_regex_posix.cpp";
-
-if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
-{
-	print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n";
-	exit 1;
-}
-if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
-{
-	print "Sorry, but i couldn't detect openssl. Make sure openssl is in your path.\n";
-	exit 1;
+# 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';
 }
 
-$config{CERTGEN} ||= 'y';
-yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
+write_configure_cache %config;
+parse_templates \%config, \%compiler, \%version;
 
-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" && -r "$config{CONFIG_DIR}/dhparams.pem") {
-			unless (system './tools/genssl gnutls') {
-				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";
-	}
-}
+print_format <<"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: $!";
-	}
-	if ($interactive && $config{CERTGEN} eq 'y')
-	{
-		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem" && -r "$config{CONFIG_DIR}/dhparams.pem") {
-			unless (system './tools/genssl openssl') {
-				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, SSL support is not available.\n\n";
-}
+Configuration is complete! You have chosen to build with the following settings:
 
-depcheck();
-writefiles();
-makecache();
-dumphash();
-
-print "\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";
-
-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;
-}
+<|GREEN Compiler:|>
+  <|GREEN Binary:|>  $config{CXX}
+  <|GREEN Name:|>    $compiler{NAME}
+  <|GREEN Version:|> $compiler{VERSION}
 
-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 Extra Modules:|>
+EOM
 
-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 = rel2abs($ENV{HOME} . "/" . $1);
-		}
-		$var = rel2abs($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 (! -d $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 (<src/modules/m_*>) {
+	my $module = basename $file, '.cpp';
+	print "  * $module\n" if -l $file;
 }
 
-sub writefiles {
-	chomp(my $incos = `uname -n -s -r`);
-	chomp(my $version = `sh src/version.sh`);
-	my $revision = getrevision();
-	my $branch = "InspIRCd-0.0";
-	if ($version =~ /^(InspIRCd-[0-9]+\.[0-9]+)\.[0-9]+/)
-	{
-		$branch = $1;
-	}
-	print "Writing \e[1;32mconfig.h\e[0m\n";
-	open(FILEHANDLE, ">include/config.h.tmp");
-	print FILEHANDLE <<EOF;
-/* Auto generated by configure, do not modify! */
-#pragma once
-
-#define BRANCH "$branch"
-#define VERSION "$version"
-#define REVISION "$revision"
-#define SYSTEM "$incos"
-
-#define CONFIG_PATH "$config{CONFIG_DIR}"
-#define DATA_PATH "$config{DATA_DIR}"
-#define LOG_PATH "$config{LOG_DIR}"
-#define MOD_PATH "$config{MODULE_DIR}"
-
-EOF
-
-	if ($config{HAS_EVENTFD} eq 'true') {
-		print FILEHANDLE "#define HAS_EVENTFD\n";
-	}
-	if ($config{HAS_CLOCK_GETTIME} eq 'true') {
-		print FILEHANDLE "#define HAS_CLOCK_GETTIME\n";
-	}
-
-	print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n";
-	close(FILEHANDLE);
-
-	unlink 'include/config.h';
-	rename 'include/config.h.tmp', 'include/config.h';
-
-	# 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.
+print_format <<"EOM";
 
-	my @dotfiles = qw(main.mk inspircd);
-	push @dotfiles, 'org.inspircd.plist' if $^O eq 'darwin';
+<|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}
 
-	foreach my $file (@dotfiles) {
-		open(FILEHANDLE, "make/template/$file") or die "Can't open make/template/$file: $!";
-		$_ = join '', <FILEHANDLE>;
-		close(FILEHANDLE);
+<|GREEN Execution Group:|> $config{GROUP} ($config{GID})
+<|GREEN Execution User:|>  $config{USER} ($config{UID})
+<|GREEN Socket Engine:|>   $config{SOCKETENGINE}
 
-		$config{BUILD_DIR} ||= rel2abs($topdir."/build");
-		$config{COMPILER} = lc $cxx{NAME};
-		$config{SYSTEM} = lc $^O;
+To build with these settings run '<|GREEN make -j${\get_cpu_count}|>' now.
 
-		for my $var (qw(
-			CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
-			STARTSCRIPT SOCKETENGINE
-		)) {
-			s/\@$var\@/$config{$var}/g;
-		}
-
-		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/\@IFNEQ (\S+) (\S+)/ifneq ($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/\@IFNEQ (\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");
-	}
-}
+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
@@ -823,7 +402,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_property($abs_extra, 'ModDep');
 		for my $dep (@deps) {
 			if (exists($extras{$dep})) {
 				my $ref = \$extras{$dep}; # Take reference.
@@ -870,7 +449,7 @@ sub enable_extras (@) {
 			next;
 		}
 		# Get dependencies, and add them to be processed.
-		my @deps = split / +/, getdependencies($extrapath);
+		my @deps = split /\s+/, get_property($extrapath, 'ModDep');
 		for my $dep (@deps) {
 			next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway.
 			if (!-e "src/modules/$dep" && !-e "include/$dep") {
@@ -906,7 +485,7 @@ EXTRA:	for my $extra (@extras) {
 		}
 		# Check if anything needs this.
 		for my $file (@files) {
-			my @deps = split / +/, getdependencies("src/modules/extra/$file");
+			my @deps = split /\s+/, get_property("src/modules/extra/$file", 'ModDep');
 			# File depends on this extra...
 			if (scalar(grep { $_ eq $extra } @deps) > 0) {
 				# And is both enabled and not about to be disabled.