X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=42ea206bd48b62003f4db36f1ddbfb64d52b0b35;hb=de35a20ab7521ccd310bbc922c75b144b9a13fc2;hp=538dffcc8b2d0b9a00d0539459858f4502721d1c;hpb=207af6fb2fede5788d2e99809b5b36d11aefa706;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 538dffcc8..42ea206bd 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 = ); if ($tmp eq "") { $tmp = $main::config{$flag} } if (($tmp eq "") || ($tmp =~ /^y/i)) @@ -74,7 +74,7 @@ sub getrevision { sub getcompilerflags { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { close(FLAGS); @@ -87,7 +87,7 @@ sub getcompilerflags { sub getlinkerflags { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { close(FLAGS); @@ -100,7 +100,7 @@ sub getlinkerflags { sub getdependencies { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { close(FLAGS); @@ -113,7 +113,7 @@ sub getdependencies { sub nopedantic { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { close(FLAGS); @@ -128,7 +128,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 +149,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 = ); if ($var eq "") { @@ -171,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 = ); $var = $default if $var eq ""; print "\n"; @@ -180,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 @@ -291,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 ";