X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=326f69e939bab0035e43159f7b98a8bef425f14f;hb=ef61e7b19ca6bee05b459088967242ae6950d9c5;hp=6d729292fd5bf7d29bb72a91eaff42bb6931040b;hpb=c9a812a5ccc5e2639ae4e1314f5f24b3d4518c68;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 6d729292f..326f69e93 100755
--- a/configure
+++ b/configure
@@ -1,17 +1,18 @@
 #!/usr/bin/env perl
-
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2012-2017 Peter Powell <petpow@saberuk.com>
-#   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) 2019 Matt Schatz <genius3000@g3k.solutions>
+#   Copyright (C) 2019 Anatole Denis <natolumin@rezel.net>
+#   Copyright (C) 2017 emerson <github@emersonveenstra.net>
+#   Copyright (C) 2013-2019 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
@@ -105,8 +106,8 @@ exit 1 unless GetOptions(
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
-	@opt_enableextras = split /,/, join(',', @opt_enableextras);
-	@opt_disableextras = split /,/, join(',', @opt_disableextras);
+	@opt_enableextras = split /[, ]+/, join(',', @opt_enableextras);
+	@opt_disableextras = split /[, ]+/, join(',', @opt_disableextras);
 	enable_extras(@opt_enableextras);
 	disable_extras(@opt_disableextras);
 	list_extras;
@@ -323,6 +324,7 @@ if (prompt_bool $interactive, $question, 0) {
 	$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';
 }
 
 # Configure module settings.
@@ -532,6 +534,8 @@ EXTRA:	for my $extra (@extras) {
 sub enable_extras (@) {
 	my (@extras) = @_;
 	for my $extra (@extras) {
+		$extra = "m_$extra" unless $extra =~ /^m_/;
+		$extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
 		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";
@@ -567,6 +571,8 @@ sub disable_extras (@)
 	closedir $dd;
 	my (@extras) = @_;
 EXTRA:	for my $extra (@extras) {
+		$extra = "m_$extra" unless $extra =~ /^m_/;
+		$extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
 		my $extrapath = "src/modules/extra/$extra";
 		my $source = "src/modules/$extra";
 		if (!-e $extrapath) {