Pedantic safe

[user/henk/code/inspircd.git] / make / configure.pm

diff --git a/make/configure.pm b/make/configure.pm
index 7965436c2501efd138f12eb4f192afabb3c6079f..cf12c900a6a8b9f34bea8e798991931efcfede9d 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,8 +1,23 @@
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 package make::configure;
+
+require 5.8.0;
+
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp);
+@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp promptstring_s);
 
 my $no_svn = 0;
 
@@ -104,11 +119,8 @@ sub getmodules
                if ($name =~ /^m_(.+)\.cpp$/)
                {
                        $mod = $1;
-                       if ($mod !~ /_static$/)
-                       {
-                               $main::modlist[$i++] = $mod;
-                               print ".";
-                       }
+                       $main::modlist[$i++] = $mod;
+                       print ".";
                }
        }
        closedir(DIRHANDLE);
@@ -139,6 +151,18 @@ sub promptnumeric($$)
        }
 }
 
+sub promptstring_s($$)
+{
+       my ($prompt,$default) = @_;
+       my $var;
+       print "$prompt\n";
+       print "[\033[1;32m$default\033[0m] -> ";
+       chomp($var = <STDIN>);
+       $var = $default if $var eq "";
+       print "\n";
+       return $var;
+}
+
 sub dumphash()
 {
        print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
@@ -147,8 +171,6 @@ sub dumphash()
        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 User Channels:\033[1;32m\t\t$main::config{MAX_CHANNE}\033[0m\n";
-       print "\033[0mMax Oper Channels:\033[1;32m\t\t$main::config{MAX_OPERCH}\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";
@@ -160,7 +182,6 @@ sub dumphash()
        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[0mStatic modules:\033[1;32m\t\t\t$main::config{STATIC_LINK}\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";
@@ -207,17 +228,14 @@ InspIRCd 1.0.x, are also allowed.
                                will disable any interactive prompting.
   --update                     Update makefiles and dependencies
   --modupdate                  Detect new modules and write makefiles
-  --svnupdate {rebuild}        Update working copy via subversion
-                               {and optionally rebuild it}
+  --svnupdate {--rebuild}      Update working copy via subversion
+                                {and optionally rebuild if --rebuild
+                                 is also specified}
   --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-channels=[n]      Specify max. number of channels
-                               a normal user may join [20]
-  --with-max-oper-channels=[n] Specify max. number of channels
-                               an irc operator may join [60]
   --with-max-clients=[n]       Specify maximum number of users
                                which may connect locally
   --enable-optimization=[n]    Optimize using -O[n] gcc flag
@@ -241,6 +259,9 @@ InspIRCd 1.0.x, are also allowed.
   --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!!!
   --prefix=[directory]         Base directory to install into (if defined,
                                can automatically define config, module, bin
                               and library dirs as subdirectories of prefix)