So, Mozarella it is for 1.1.7

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

diff --git a/make/configure.pm b/make/configure.pm
index 7b0a354548a2113d7063abb9cc09ca5454f82400..dd2dc90896bd68af3e9596d577adbb90fbc889db 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,8 +1,17 @@
+#
+# Copyright 2002-2007 The ChatSpike Development Team
+# <brain@chatspike.net>
+# <Craig@chatspike.net>
+#
+# Licensed under GPL, please see the COPYING file
+# for more information
+#
+
 package make::configure;
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-@EXPORT = qw(promptnumeric promptstring 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);
 
 my $no_svn = 0;
 
@@ -139,17 +148,16 @@ sub promptnumeric($$)
        }
 }
 
-sub promptstring($$$)
+sub promptstring($$)
 {
-       my ($prompt, $configitem, $default) = @_;
-       print "\nPlease enter the $prompt?\n";
+       my ($prompt,$default) = @_;
+       my $var;
+       print "$prompt\n";
        print "[\033[1;32m$default\033[0m] -> ";
        chomp($var = <STDIN>);
-       if ($var eq "")
-       {
-               $var = $default;
-       }
-       $main::config{$configitem} = $var;
+       $var = $default if $var eq "";
+       print "\n";
+       return $var;
 }
 
 sub dumphash()
@@ -160,8 +168,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";
@@ -220,17 +226,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