X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=e9c1a04c3838048b5f0b56ffdfb688f58dcff4ab;hb=fc826b6f0127f8075e87c8c3d9e8a5b3ee94abe1;hp=448ad90da1910acec57bd368c67793b912cade4b;hpb=1ec51cea95284c7e01e3e434805b22faec45b4c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 448ad90da..e9c1a04c3 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 = ); + 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)) { @@ -54,7 +60,7 @@ sub getrevision { if ($data eq "") { $no_svn = 1; - $rev = "0"; + my $rev = "0"; return $rev; } $data =~ /Revision: (\d+)/; @@ -68,54 +74,74 @@ sub getrevision { sub getcompilerflags { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); - return undef; + return ""; } sub getlinkerflags { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); - return undef; + return ""; } sub getdependencies { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); - return undef; + return ""; } +sub nopedantic { + my ($file) = @_; + open(FLAGS, $file) or return ""; + while () { + if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { + my $x = translate_functions($_, $file); + next if ($x eq ""); + 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 +157,8 @@ sub promptnumeric($$) while (!$continue) { print "Please enter the maximum $prompt?\n"; - print "[\033[1;32m$main::config{$configitem}\033[0m] -> "; - chomp($var = ); + print "[\e[1;32m$main::config{$configitem}\e[0m] -> "; + chomp(my $var = ); if ($var eq "") { $var = $main::config{$configitem}; @@ -153,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 = ); $var = $default if $var eq ""; print "\n"; @@ -162,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 \e[0m\n"; + print "\e[1;32m tag in the configuration file for more information.\e[0m\n\n"; } sub is_dir @@ -203,7 +222,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 +242,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 @@ -231,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] @@ -248,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!!! @@ -271,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 ";