X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=42ea206bd48b62003f4db36f1ddbfb64d52b0b35;hb=29b51086b95c86f812ac35ed7d3333f060ba5a8c;hp=448ad90da1910acec57bd368c67793b912cade4b;hpb=1ec51cea95284c7e01e3e434805b22faec45b4c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 448ad90da..42ea206bd 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -11,17 +11,23 @@
 # ---------------------------------------------------
 
 package make::configure;
+
+require 5.8.0;
+
+use strict;
+use warnings FATAL => qw(all);
+
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp promptstring_s);
+our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s);
 
 my $no_svn = 0;
 
 sub yesno {
 	my ($flag,$prompt) = @_;
-	print "$prompt [\033[1;32m$main::config{$flag}\033[0m] -> ";
-	chomp($tmp = <STDIN>);
+	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))
 	{
@@ -54,7 +60,7 @@ sub getrevision {
 	if ($data eq "")
 	{
 		$no_svn = 1;
-		$rev = "0";
+		my $rev = "0";
 		return $rev;
 	}
 	$data =~ /Revision: (\d+)/;
@@ -68,7 +74,7 @@ sub getrevision {
 
 sub getcompilerflags {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
 			close(FLAGS);
@@ -76,12 +82,12 @@ sub getcompilerflags {
 		}
 	}
 	close(FLAGS);
-	return undef;
+	return "";
 }
 
 sub getlinkerflags {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) {
 			close(FLAGS);
@@ -89,12 +95,12 @@ sub getlinkerflags {
 		}
 	}
 	close(FLAGS);
-	return undef;
+	return "";
 }
 
 sub getdependencies {
 	my ($file) = @_;
-	open(FLAGS, $file);
+	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
 		if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) {
 			close(FLAGS);
@@ -102,20 +108,32 @@ sub getdependencies {
 		}
 	}
 	close(FLAGS);
-	return undef;
+	return "";
 }
 
+sub nopedantic {
+	my ($file) = @_;
+	open(FLAGS, $file) or return "";
+	while (<FLAGS>) {
+		if ($_ =~ /^\/\* \$NoPedantic \*\/$/) {
+			close(FLAGS);
+			return 1;
+		}
+	}
+	close(FLAGS);
+	return 0;
+}
 
 sub getmodules
 {
 	my $i = 0;
 	print "Detecting modules ";
-	opendir(DIRHANDLE, "src/modules");
-	foreach $name (sort readdir(DIRHANDLE))
+	opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!");
+	foreach my $name (sort readdir(DIRHANDLE))
 	{
 		if ($name =~ /^m_(.+)\.cpp$/)
 		{
-			$mod = $1;
+			my $mod = $1;
 			$main::modlist[$i++] = $mod;
 			print ".";
 		}
@@ -131,8 +149,8 @@ sub promptnumeric($$)
 	while (!$continue)
 	{
 		print "Please enter the maximum $prompt?\n";
-		print "[\033[1;32m$main::config{$configitem}\033[0m] -> ";
-		chomp($var = <STDIN>);
+		print "[\e[1;32m$main::config{$configitem}\e[0m] -> ";
+		chomp(my $var = <STDIN>);
 		if ($var eq "")
 		{
 			$var = $main::config{$configitem};
@@ -153,7 +171,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";
@@ -162,27 +180,27 @@ 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[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[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";
 }
 
 sub is_dir
@@ -203,7 +221,7 @@ sub is_dir
 
 sub showhelp
 {
-	chomp($PWD = `pwd`);
+	chomp(my $PWD = `pwd`);
 	print "Usage: configure [options]
 
 *** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE ***
@@ -223,6 +241,8 @@ InspIRCd 1.0.x, are also allowed.
 
   --disable-interactive        Sets no options intself, 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
@@ -271,6 +291,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
 
 ";