X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=67e91c825aeb44cf2ad6ec4c6e8647dd206051b2;hb=a9ca786a6a875d38f54f50b7c23ea1ad5d247511;hp=230bd39345d9f61c5615b83247b7a30a5ad63b4a;hpb=9fbbdba61825a2316aa71492138059fd4d157217;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 230bd3934..67e91c825 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,14 +1,25 @@
-#       +------------------------------------+
-#       | Inspire Internet Relay Chat Daemon |
-#       +------------------------------------+
 #
-#  InspIRCd: (C) 2002-2010 InspIRCd Development Team
-# See: http://wiki.inspircd.org/Credits
+# InspIRCd -- Internet Relay Chat Daemon
 #
-# This program is free but copyrighted software; see
-#      the file COPYING for details.
+#   Copyright (C) 2012 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+#   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+#   Copyright (C) 2007 Dennis Friis <peavey@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
+# 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::configure;
 
@@ -20,10 +31,29 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s);
+our @EXPORT = qw(test_file test_header promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s module_installed);
 
 my $no_git = 0;
 
+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 yesno {
 	my ($flag,$prompt) = @_;
 	print "$prompt [\e[1;32m$main::config{$flag}\e[0m] -> ";
@@ -182,6 +212,13 @@ sub promptnumeric($$)
 	}
 }
 
+sub module_installed($)
+{
+	my $module = shift;
+	eval("use $module;");
+	return !$@;
+}
+
 sub promptstring_s($$)
 {
 	my ($prompt,$default) = @_;
@@ -270,6 +307,10 @@ InspIRCd 1.0.x, are also allowed.
                                [$PWD]
   --config-dir=[directory]     Config file directory for config and SSL certs
                                [$PWD/conf]
+  --log-dir=[directory]	       Log file directory for logs
+			       [$PWD/logs]
+  --data-dir=[directory]       Data directory for variable data, such as the permchannel configuration and the XLine database
+			       [$PWD/data]
   --module-dir=[directory]     Modules directory for loadable modules
                                [$PWD/modules]
   --binary-dir=[directory]     Binaries directory for core binary