X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=4f176324c2b52c2675d45787f94c961524b5f8c3;hb=9010a8832098780ebf40c716f5b4689e66482846;hp=41a116df0ffef67811f8406cc064f8e7642e59ad;hpb=9e139f31b2e79cdfd7d468771176b736671a8b9d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 41a116df0..4f176324c 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -77,8 +77,10 @@ sub getcompilerflags { 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); @@ -87,11 +89,13 @@ sub getcompilerflags { 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); @@ -100,11 +104,13 @@ sub getlinkerflags { 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); @@ -113,9 +119,11 @@ sub getdependencies { sub nopedantic { my ($file) = @_; - open(FLAGS, $file); + open(FLAGS, $file) or return ""; while () { if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { + my $x = translate_functions($_, $file); + next if ($x eq ""); close(FLAGS); return 1; } @@ -128,7 +136,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$/) @@ -185,7 +193,6 @@ sub dumphash() 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"; @@ -253,8 +260,6 @@ InspIRCd 1.0.x, are also allowed. --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]