X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=5444ca40cd86ca9fd4a6993e625ec01b911eae27;hb=fee65af28e1db5cc431bda2dc643952b88461a74;hp=41a116df0ffef67811f8406cc064f8e7642e59ad;hpb=9e139f31b2e79cdfd7d468771176b736671a8b9d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 41a116df0..5444ca40c 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -20,7 +20,7 @@ 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(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies getmodversion nopedantic resolve_directory yesno showhelp promptstring_s);
 
 my $no_svn = 0;
 
@@ -56,12 +56,17 @@ sub getrevision {
 	{
 		return "0";
 	}
-	my $data = `svn info`;
+	my $data = `svn info 2>/dev/null`;
 	if ($data eq "")
 	{
-		$no_svn = 1;
-		my $rev = "0";
-		return $rev;
+		$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;
@@ -77,8 +82,10 @@ sub getcompilerflags {
 	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
+			my $x = translate_functions($1, $file);
+			next if ($x eq "");
 			close(FLAGS);
-			return translate_functions($1,$file);
+			return $x;
 		}
 	}
 	close(FLAGS);
@@ -87,11 +94,13 @@ sub getcompilerflags {
 
 sub getlinkerflags {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) {
+			my $x = translate_functions($1, $file);
+			next if ($x eq "");
 			close(FLAGS);
-			return translate_functions($1,$file);
+			return $x;
 		}
 	}
 	close(FLAGS);
@@ -100,11 +109,28 @@ sub getlinkerflags {
 
 sub getdependencies {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) {
+			my $x = translate_functions($1, $file);
+			next if ($x eq "");
 			close(FLAGS);
-			return translate_functions($1,$file);
+			return $x;
+		}
+	}
+	close(FLAGS);
+	return "";
+}
+
+sub getmodversion {
+	my ($file) = @_;
+	open(FLAGS, $file) or return "";
+	while (<FLAGS>) {
+		if ($_ =~ /^\/\* \$ModVersion: (.+) \*\/$/) {
+			my $x = translate_functions($1, $file);
+			next if ($x eq "");
+			close(FLAGS);
+			return $x;
 		}
 	}
 	close(FLAGS);
@@ -113,9 +139,11 @@ sub getdependencies {
 
 sub nopedantic {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$NoPedantic \*\/$/) {
+			my $x = translate_functions($_, $file);
+			next if ($x eq "");
 			close(FLAGS);
 			return 1;
 		}
@@ -126,20 +154,34 @@ sub nopedantic {
 
 sub getmodules
 {
+	my ($silent) = @_;
+
 	my $i = 0;
-	print "Detecting modules ";
-	opendir(DIRHANDLE, "src/modules");
+
+	if (!$silent)
+	{
+		print "Detecting modules ";
+	}
+
+	opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!");
 	foreach my $name (sort readdir(DIRHANDLE))
 	{
 		if ($name =~ /^m_(.+)\.cpp$/)
 		{
 			my $mod = $1;
 			$main::modlist[$i++] = $mod;
-			print ".";
+			if (!$silent)
+			{
+				print ".";
+			}
 		}
 	}
 	closedir(DIRHANDLE);
-	print "\nOk, $i modules.\n";
+
+	if (!$silent)
+	{
+		print "\nOk, $i modules.\n";
+	}
 }
 
 sub promptnumeric($$)
@@ -185,22 +227,15 @@ sub dumphash()
 	print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
 	print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
 	print "\e[0mLibrary path:\e[1;32m\t\t\t$main::config{LIBRARY_DIR}\e[0m\n";
-	print "\e[0mMax connections:\e[1;32m\t\t$main::config{MAX_CLIENT}\e[0m\n";
-	print "\e[0mMax nickname length:\e[1;32m\t\t$main::config{NICK_LENGT}\e[0m\n";
-	print "\e[0mMax channel length:\e[1;32m\t\t$main::config{CHAN_LENGT}\e[0m\n";
-	print "\e[0mMax mode length:\e[1;32m\t\t$main::config{MAXI_MODES}\e[0m\n";
-	print "\e[0mMax ident length:\e[1;32m\t\t$main::config{MAX_IDENT}\e[0m\n";
-	print "\e[0mMax quit length:\e[1;32m\t\t$main::config{MAX_QUIT}\e[0m\n";
-	print "\e[0mMax topic length:\e[1;32m\t\t$main::config{MAX_TOPIC}\e[0m\n";
-	print "\e[0mMax kick length:\e[1;32m\t\t$main::config{MAX_KICK}\e[0m\n";
-	print "\e[0mMax name length:\e[1;32m\t\t$main::config{MAX_GECOS}\e[0m\n";
-	print "\e[0mMax away length:\e[1;32m\t\t$main::config{MAX_AWAY}\e[0m\n";
-	print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.x\e[0m\n";
+	print "\e[0mGCC Version Found:\e[1;32m\t\t$main::config{GCCVER}.$main::config{GCCMINOR}\e[0m\n";
 	print "\e[0mCompiler program:\e[1;32m\t\t$main::config{CC}\e[0m\n";
 	print "\e[0mIPv6 Support:\e[1;32m\t\t\t$main::config{IPV6}\e[0m\n";
 	print "\e[0mIPv6 to IPv4 Links:\e[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\e[0m\n";
 	print "\e[0mGnuTLS Support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
 	print "\e[0mOpenSSL Support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n\n";
+	print "\e[1;32mImportant note: The maximum length values are now configured in the\e[0m\n";
+	print "\e[1;32m                configuration file, not in ./configure! See the <limits>\e[0m\n";
+	print "\e[1;32m                tag in the configuration file for more information.\e[0m\n\n";
 }
 
 sub is_dir
@@ -251,10 +286,6 @@ InspIRCd 1.0.x, are also allowed.
   --clean                      Remove .config.cache file and go interactive
   --enable-gnutls              Enable GnuTLS module [no]
   --enable-openssl             Enable OpenSSL module [no]
-  --with-nick-length=[n]       Specify max. nick length [32]
-  --with-channel-length=[n]    Specify max. channel length [64]
-  --with-max-clients=[n]       Specify maximum number of users
-                               which may connect locally
   --enable-optimization=[n]    Optimize using -O[n] gcc flag
   --enable-epoll               Enable epoll() where supported [set]
   --enable-kqueue              Enable kqueue() where supported [set]
@@ -268,14 +299,6 @@ InspIRCd 1.0.x, are also allowed.
   --disable-remote-ipv6        Do not allow remote ipv6 servers [not set]
   --with-cc=[filename]         Use an alternative g++ binary to
                                build InspIRCd [g++]
-  --with-ident-length=[n]      Specify max length of ident [12]
-  --with-quit-length=[n]       Specify max length of quit [200]
-  --with-topic-length=[n]      Specify max length of topic [350]
-  --with-kick-length=[n]       Specify max length of kick [200]
-  --with-gecos-length=[n]      Specify max length of gecos [150]
-  --with-away-length=[n]       Specify max length of away [150]
-  --with-max-modes=[n]         Specify max modes per line which
-                               have parameters [20]
   --with-maxbuf=[n]            Change the per message buffer size [512]
                                DO NOT ALTER THIS OPTION WITHOUT GOOD REASON
                                AS IT *WILL* BREAK CLIENTS!!!