X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=2ae9c7fa029c036d6db7fed134bbcac2c34953f8;hb=86c454a676eed57486fc555c3a9df57cd12b4dd6;hp=dbba7a1436b68e5607af9fdec30128ad0cef910c;hpb=03a1bf15b1da7643b237c22db1a478916a976ccf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index dbba7a143..2ae9c7fa0 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,9 +31,28 @@ 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_svn = 0;
+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) = @_;
@@ -52,29 +82,18 @@ sub resolve_directory
 }
 
 sub getrevision {
-	if ($no_svn)
+	if ($no_git)
 	{
 		return "0";
 	}
-	my $data = `svn info 2>/dev/null`;
+	my $data = `git describe --tags 2>/dev/null`;
 	if ($data eq "")
 	{
-		$data = `git describe --tags 2>/dev/null`;
-		if ($data eq "")
-		{
-			$no_svn = 1;
-			return '0';
-		}
-		chomp $data; # remove \n
-		return $data;
-	}
-	$data =~ /Revision: (\d+)/;
-	my $rev = $1;
-	if (!defined($rev))
-	{
-		$rev = "0";
+		$no_git = 1;
+		return '0';
 	}
-	return $rev;
+	chomp $data; # remove \n
+	return $data;
 }
 
 sub getcompilerflags {
@@ -193,6 +212,13 @@ sub promptnumeric($$)
 	}
 }
 
+sub module_installed($)
+{
+	my $module = shift;
+	eval("use $module;");
+	return !$@;
+}
+
 sub promptstring_s($$)
 {
 	my ($prompt,$default) = @_;
@@ -239,7 +265,8 @@ sub is_dir
 sub showhelp
 {
 	chomp(my $PWD = `pwd`);
-	print "Usage: configure [options]
+	print <<EOH;
+Usage: configure [options]
 
 *** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE ***
 *** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING  ***
@@ -258,35 +285,28 @@ InspIRCd 1.0.x, are also allowed.
 
   --disable-interactive        Sets no options itself, but
                                will disable any interactive prompting.
-  --disable-rpath              Disable runtime paths. DO NOT USE UNLESS
-                               YOU KNOW WHAT YOU ARE DOING!
   --update                     Update makefiles and dependencies
-  --modupdate                  Detect new modules and write makefiles
-  --svnupdate {--rebuild}      Update working copy via subversion
-                                {and optionally rebuild if --rebuild
-                                 is also specified}
   --clean                      Remove .config.cache file and go interactive
   --enable-gnutls              Enable GnuTLS module [no]
   --enable-openssl             Enable OpenSSL module [no]
-  --enable-optimization=[n]    Optimize using -O[n] gcc flag
   --enable-epoll               Enable epoll() where supported [set]
   --enable-kqueue              Enable kqueue() where supported [set]
   --disable-epoll              Do not enable epoll(), fall back
                                to select() [not set]
   --disable-kqueue             Do not enable kqueue(), fall back
                                to select() [not set]
-  --disable-ipv6               Do not build ipv6 native InspIRCd [not set]
-  --with-cc=[filename]         Use an alternative g++ binary to
+  --with-cc=[filename]         Use an alternative compiler to
                                build InspIRCd [g++]
-  --with-maxbuf=[n]            Change the per message buffer size [512]
-                               DO NOT ALTER THIS OPTION WITHOUT GOOD REASON
-                               AS IT *WILL* BREAK CLIENTS!!!
   --prefix=[directory]         Base directory to install into (if defined,
                                can automatically define config, module, bin
-			       and library dirs as subdirectories of prefix)
+                               and library dirs as subdirectories of prefix)
                                [$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
@@ -298,7 +318,7 @@ InspIRCd 1.0.x, are also allowed.
   --disable-extras=[extras]    Disable the specified list of extras
   --help                       Show this help text and exit
 
-";
+EOH
 	exit(0);
 }