X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=9b8e2d0e4b411f8c4174686d35565f5120168f94;hb=e04ece9061f3b454876a09da9cac018d6aabef9a;hp=6a2faaef42d850a00e35dd1e40a965170da5daa2;hpb=b4c7be2458373ae663cd9408c9bb4efbd13bb84a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 6a2faaef4..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,9 +31,9 @@ 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) = @_; @@ -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) 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); @@ -89,9 +96,11 @@ sub getlinkerflags { my ($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); @@ -102,9 +111,11 @@ sub getdependencies { my ($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); @@ -115,7 +126,9 @@ sub nopedantic { my ($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,8 +139,15 @@ sub nopedantic { sub getmodules { + my ($silent) = @_; + my $i = 0; - print "Detecting modules "; + + if (!$silent) + { + print "Detecting modules "; + } + opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!"); foreach my $name (sort readdir(DIRHANDLE)) { @@ -135,11 +155,18 @@ sub getmodules { 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($$) @@ -166,6 +193,13 @@ sub promptnumeric($$) } } +sub module_installed($) +{ + my $module = shift; + eval("use $module;"); + return !$@; +} + sub promptstring_s($$) { my ($prompt,$default) = @_; @@ -184,22 +218,13 @@ sub dumphash() 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 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 \e[0m\n"; + print "\e[1;32m tag in the configuration file for more information.\e[0m\n\n"; } sub is_dir @@ -221,7 +246,8 @@ sub is_dir sub showhelp { chomp(my $PWD = `pwd`); - print "Usage: configure [options] + print <