X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=e9c1a04c3838048b5f0b56ffdfb688f58dcff4ab;hb=fc826b6f0127f8075e87c8c3d9e8a5b3ee94abe1;hp=538dffcc8b2d0b9a00d0539459858f4502721d1c;hpb=207af6fb2fede5788d2e99809b5b36d11aefa706;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 538dffcc8..e9c1a04c3 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -26,7 +26,7 @@ my $no_svn = 0;
 
 sub yesno {
 	my ($flag,$prompt) = @_;
-	print "$prompt [\033[1;32m$main::config{$flag}\033[0m] -> ";
+	print "$prompt [\e[1;32m$main::config{$flag}\e[0m] -> ";
 	chomp(my $tmp = <STDIN>);
 	if ($tmp eq "") { $tmp = $main::config{$flag} }
 	if (($tmp eq "") || ($tmp =~ /^y/i))
@@ -74,11 +74,13 @@ sub getrevision {
 
 sub getcompilerflags {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	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 +89,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 +104,13 @@ 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);
@@ -113,9 +119,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;
 		}
@@ -128,7 +136,7 @@ sub getmodules
 {
 	my $i = 0;
 	print "Detecting modules ";
-	opendir(DIRHANDLE, "src/modules");
+	opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!");
 	foreach my $name (sort readdir(DIRHANDLE))
 	{
 		if ($name =~ /^m_(.+)\.cpp$/)
@@ -149,7 +157,7 @@ sub promptnumeric($$)
 	while (!$continue)
 	{
 		print "Please enter the maximum $prompt?\n";
-		print "[\033[1;32m$main::config{$configitem}\033[0m] -> ";
+		print "[\e[1;32m$main::config{$configitem}\e[0m] -> ";
 		chomp(my $var = <STDIN>);
 		if ($var eq "")
 		{
@@ -171,7 +179,7 @@ sub promptstring_s($$)
 	my ($prompt,$default) = @_;
 	my $var;
 	print "$prompt\n";
-	print "[\033[1;32m$default\033[0m] -> ";
+	print "[\e[1;32m$default\e[0m] -> ";
 	chomp($var = <STDIN>);
 	$var = $default if $var eq "";
 	print "\n";
@@ -180,27 +188,20 @@ sub promptstring_s($$)
 
 sub dumphash()
 {
-	print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
-	print "\033[0mBase install path:\033[1;32m\t\t$main::config{BASE_DIR}\033[0m\n";
-	print "\033[0mConfig path:\033[1;32m\t\t\t$main::config{CONFIG_DIR}\033[0m\n";
-	print "\033[0mModule path:\033[1;32m\t\t\t$main::config{MODULE_DIR}\033[0m\n";
-	print "\033[0mLibrary path:\033[1;32m\t\t\t$main::config{LIBRARY_DIR}\033[0m\n";
-	print "\033[0mMax connections:\033[1;32m\t\t$main::config{MAX_CLIENT}\033[0m\n";
-	print "\033[0mMax nickname length:\033[1;32m\t\t$main::config{NICK_LENGT}\033[0m\n";
-	print "\033[0mMax channel length:\033[1;32m\t\t$main::config{CHAN_LENGT}\033[0m\n";
-	print "\033[0mMax mode length:\033[1;32m\t\t$main::config{MAXI_MODES}\033[0m\n";
-	print "\033[0mMax ident length:\033[1;32m\t\t$main::config{MAX_IDENT}\033[0m\n";
-	print "\033[0mMax quit length:\033[1;32m\t\t$main::config{MAX_QUIT}\033[0m\n";
-	print "\033[0mMax topic length:\033[1;32m\t\t$main::config{MAX_TOPIC}\033[0m\n";
-	print "\033[0mMax kick length:\033[1;32m\t\t$main::config{MAX_KICK}\033[0m\n";
-	print "\033[0mMax name length:\033[1;32m\t\t$main::config{MAX_GECOS}\033[0m\n";
-	print "\033[0mMax away length:\033[1;32m\t\t$main::config{MAX_AWAY}\033[0m\n";
-	print "\033[0mGCC Version Found:\033[1;32m\t\t$main::config{GCCVER}.x\033[0m\n";
-	print "\033[0mCompiler program:\033[1;32m\t\t$main::config{CC}\033[0m\n";
-	print "\033[0mIPv6 Support:\033[1;32m\t\t\t$main::config{IPV6}\033[0m\n";
-	print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$main::config{SUPPORT_IP6LINKS}\033[0m\n";
-	print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$main::config{USE_GNUTLS}\033[0m\n";
-	print "\033[0mOpenSSL Support:\033[1;32m\t\t$main::config{USE_OPENSSL}\033[0m\n\n";
+	print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n";
+	print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
+	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[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 +252,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 +265,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!!!
@@ -291,6 +280,9 @@ InspIRCd 1.0.x, are also allowed.
                                [$PWD/bin]
   --library-dir=[directory]    Library directory for core libraries
                                [$PWD/lib]
+  --list-extras                Show current status of extra modules
+  --enable-extras=[extras]     Enable the specified list of extras
+  --disable-extras=[extras]    Disable the specified list of extras
   --help                       Show this help text and exit
 
 ";