X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=9b8e2d0e4b411f8c4174686d35565f5120168f94;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=203afc0ea909fccdafb3b4890494232e4e414413;hpb=d13cd5ca80b969b823fbbfcc31531fc0ea897c04;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 203afc0ea..9b8e2d0e4 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -1,14 +1,25 @@ -# +------------------------------------+ -# | Inspire Internet Relay Chat Daemon | -# +------------------------------------+ # -# InspIRCd: (C) 2002-2007 InspIRCd Development Team -# See: http://www.inspircd.org/wiki/index.php/Credits +# InspIRCd -- Internet Relay Chat Daemon # -# This program is free but copyrighted software; see -# the file COPYING for details. +# Copyright (C) 2012 Peter Powell +# Copyright (C) 2008 Robin Burchell +# Copyright (C) 2007-2008 Craig Edwards +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2007 Dennis Friis +# +# 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 . # -# --------------------------------------------------- + package make::configure; @@ -20,13 +31,13 @@ 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 nopedantic resolve_directory yesno showhelp promptstring_s module_installed); -my $no_svn = 0; +my $no_git = 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)) @@ -52,33 +63,29 @@ sub resolve_directory } sub getrevision { - if ($no_svn) + if ($no_git) { return "0"; } - my $data = `svn info`; + my $data = `git describe --tags 2>/dev/null`; if ($data eq "") { - $no_svn = 1; - my $rev = "0"; - return $rev; + $no_git = 1; + return '0'; } - $data =~ /Revision: (\d+)/; - my $rev = $1; - if (!defined($rev)) - { - $rev = "0"; - } - return $rev; + chomp $data; # remove \n + return $data; } sub getcompilerflags { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { - if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/\r?$/) { + 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 () { - if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/\r?$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); @@ -100,11 +109,13 @@ sub getlinkerflags { sub getdependencies { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { - if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$ModDep: (.+) \*\/\r?$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); @@ -113,9 +124,11 @@ sub getdependencies { sub nopedantic { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { - if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { + if ($_ =~ /^\/\* \$NoPedantic \*\/\r?$/) { + my $x = translate_functions($_, $file); + next if ($x eq ""); close(FLAGS); return 1; } @@ -126,20 +139,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($$) @@ -149,7 +176,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 "") { @@ -166,12 +193,19 @@ sub promptnumeric($$) } } +sub module_installed($) +{ + my $module = shift; + eval("use $module;"); + return !$@; +} + 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 +214,17 @@ 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[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[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 \e[0m\n"; + print "\e[1;32m tag in the configuration file for more information.\e[0m\n\n"; } sub is_dir @@ -222,7 +246,8 @@ sub is_dir sub showhelp { chomp(my $PWD = `pwd`); - print "Usage: configure [options] + print <