From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 22 Mar 2015 23:54:40 +0000 (+0100)
Subject: Merge pull request #1005 from SaberUK/master+minor-tweaks
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=aaae660fee19a56c752bdec84da86c4b1e779af0;hp=e1e7ab0a18100d7e2cde0eb8d787f6ce1f958643;p=user%2Fhenk%2Fcode%2Finspircd.git

Merge pull request #1005 from SaberUK/master+minor-tweaks

Various changes mainly relating to the build system.
---

diff --git a/configure b/configure
index d7cf0d732..1ff38bad1 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,7 @@ use make::console;
 my ($opt_binary_dir,
     $opt_config_dir,
     $opt_data_dir,
+    $opt_development,
     $opt_disable_interactive,
     $opt_distribution_label,
     $opt_gid,
@@ -71,6 +72,7 @@ GetOptions(
 	'help'	 => \&cmd_help,
 	'update' => \&cmd_update,
 
+	'development'          => \$opt_development,
 	'disable-interactive'  => \$opt_disable_interactive,
 	'distribution-label=s' => \$opt_distribution_label,
 	'binary-dir=s'         => \$opt_binary_dir,
@@ -107,6 +109,7 @@ our $interactive = !(
 	defined $opt_binary_dir ||
 	defined $opt_config_dir ||
 	defined $opt_data_dir ||
+	defined $opt_development ||
 	defined $opt_disable_interactive ||
 	defined $opt_distribution_label ||
 	defined $opt_gid ||
@@ -233,7 +236,7 @@ $config{UID}  = $user[2];
 system 'tput', 'clear' if $interactive;
 
 # Check that the user actually wants this version.
-if ($version{LABEL} ne 'release' && $interactive) {
+if ($version{LABEL} ne 'release') {
 	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
@@ -242,9 +245,11 @@ 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;
+	if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development || 0) {
+		print STDERR "If you understand this warning and still want to continue pass the --development flag.\n" unless $interactive;
+		exit 1;
+	}
 }
 
 # Configure directory settings.
@@ -267,10 +272,10 @@ if (prompt_bool $interactive, $question, 0) {
 	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{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{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};
 }
diff --git a/include/modules/cap.h b/include/modules/cap.h
index 7aa60cd21..b1bfbc3f9 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -55,7 +55,7 @@ class GenericCap : public Events::ModuleEventListener
 	{
 	}
 
-	void OnCapEvent(CapEvent& ev) CXX11_OVERRIDE
+	void OnCapEvent(CapEvent& ev)
 	{
 		if (!active)
 			return;
diff --git a/make/configure.pm b/make/configure.pm
index 2cd5beb60..84f076483 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -167,7 +167,7 @@ FLAGS
                                 will search for c++, g++, clang++ or icpc.
 
 If you have any problems with configuring InspIRCd then visit our IRC channel
-at irc.ChatSpike.net #InspIRCd.
+at irc.inspircd.org #InspIRCd for support.
 
 EOH
 	exit 0;
diff --git a/make/console.pm b/make/console.pm
index 9be5ef47c..045df8a70 100644
--- a/make/console.pm
+++ b/make/console.pm
@@ -80,13 +80,13 @@ sub prompt_bool($$$) {
 	return $answer =~ /y/i;
 }
 
-sub prompt_dir($$$) {
-	my ($interactive, $question, $default) = @_;
+sub prompt_dir($$$;$) {
+	my ($interactive, $question, $default, $create_now) = @_;
 	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) {
+		if ($create && $create_now) {
 			my $mkpath = eval {
 				mkpath($answer, 0, 0750);
 				return 1;
diff --git a/tools/test-build b/tools/test-build
index b809a401e..1b0192e31 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -51,7 +51,7 @@ foreach my $compiler (@compilers) {
 	foreach my $socketengine (@socketengines) {
 		print "Attempting to build using the $compiler compiler and the $socketengine socket engine...\n";
 		system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES};
-		if (system './configure', '--disable-interactive', '--socketengine', $socketengine) {
+		if (system './configure', '--development', '--socketengine', $socketengine) {
 			print "Failed to configure using the $compiler compiler and the $socketengine socket engine!\n";
 			exit 1;
 		}