Add <securelist:exception> to allow certain masks to get around securelist.

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

diff --git a/make/configure.pm b/make/configure.pm
index 7b0a354548a2113d7063abb9cc09ca5454f82400..a1a42786c2c9e6eb81c78f0afd86e8e5b23971d9 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -2,7 +2,7 @@ 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);
 
 my $no_svn = 0;
 
@@ -139,19 +139,6 @@ sub promptnumeric($$)
        }
 }
 
-sub promptstring($$$)
-{
-       my ($prompt, $configitem, $default) = @_;
-       print "\nPlease enter the $prompt?\n";
-       print "[\033[1;32m$default\033[0m] -> ";
-       chomp($var = <STDIN>);
-       if ($var eq "")
-       {
-               $var = $default;
-       }
-       $main::config{$configitem} = $var;
-}
-
 sub dumphash()
 {
        print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
@@ -220,8 +207,9 @@ 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 it if --update
+                                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]