Move showhelp() into make/configure.pm

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6323 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 77 insertions, 76 deletions

diff --git a/configure b/configure
index 6f5f222e7..152159a98 100755
--- a/configure
+++ b/configure
@@ -1535,78 +1535,3 @@ ITEM
 	close(FH);
 }
 
-sub showhelp
-{
-	chomp($PWD = `pwd`);
-	print "Usage: configure [options]
-
-*** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE ***
-*** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING  ***
-***     NON-INTERACTIVE CONFIGURE ON THE FORUMS OR ON IRC!    ***
-
-Options: [defaults in brackets after descriptions]
-
-When no options are specified, interactive
-configuration is started and you must specify
-any required values manually. If one or more
-options are specified, non-interactive configuration
-is started, and any omitted values are defaulted.
-
-Arguments with a single \"-\" symbol, as in
-InspIRCd 1.0.x, are also allowed.
-
-  --disable-interactive        Sets no options intself, but
-                               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}
-  --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
-  --enable-epoll               Enable epoll() where supported [set]
-  --enable-kqueue              Enable kqueue() where supported [set]
-  --disable-epoll              Do not enable epoll(), fall back
-                               to select() [not set]
-  --disable-kqueue             Do not enable kqueue(), fall back
-                               to select() [not set]
-  --enable-ipv6                Build ipv6 native InspIRCd [no]
-  --enable-remote-ipv6         Build with ipv6 support for remote
-                               servers on the network [yes]
-  --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]
-  --prefix=[directory]         Base directory to install into (if defined,
-                               can automatically define config, module, bin
-			       and library dirs as subdirectories of prefix)
-                               [$PWD]
-  --config-dir=[directory]     Config file directory for config and SSL certs
-                               [$PWD/conf]
-  --module-dir=[directory]     Modules directory for loadable modules
-                               [$PWD/modules]
-  --binary-dir=[directory]     Binaries directory for core binary
-                               [$PWD/bin]
-  --library-dir=[directory]    Library directory for core libraries
-                               [$PWD/lib]
-  --help                       Show this help text and exit
-
-";
-	exit(0);
-}
diff --git a/make/configure.pm b/make/configure.pm
index 11ff9be29..7965436c2 100644
--- 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 dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno);
+@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp);
 
 my $no_svn = 0;
 
@@ -183,5 +183,81 @@ sub is_dir
 	}
 }
 
+sub showhelp
+{
+	chomp($PWD = `pwd`);
+	print "Usage: configure [options]
+
+*** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE ***
+*** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING  ***
+***     NON-INTERACTIVE CONFIGURE ON THE FORUMS OR ON IRC!    ***
+
+Options: [defaults in brackets after descriptions]
+
+When no options are specified, interactive
+configuration is started and you must specify
+any required values manually. If one or more
+options are specified, non-interactive configuration
+is started, and any omitted values are defaulted.
+
+Arguments with a single \"-\" symbol, as in
+InspIRCd 1.0.x, are also allowed.
+
+  --disable-interactive        Sets no options intself, but
+                               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}
+  --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
+  --enable-epoll               Enable epoll() where supported [set]
+  --enable-kqueue              Enable kqueue() where supported [set]
+  --disable-epoll              Do not enable epoll(), fall back
+                               to select() [not set]
+  --disable-kqueue             Do not enable kqueue(), fall back
+                               to select() [not set]
+  --enable-ipv6                Build ipv6 native InspIRCd [no]
+  --enable-remote-ipv6         Build with ipv6 support for remote
+                               servers on the network [yes]
+  --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]
+  --prefix=[directory]         Base directory to install into (if defined,
+                               can automatically define config, module, bin
+			       and library dirs as subdirectories of prefix)
+                               [$PWD]
+  --config-dir=[directory]     Config file directory for config and SSL certs
+                               [$PWD/conf]
+  --module-dir=[directory]     Modules directory for loadable modules
+                               [$PWD/modules]
+  --binary-dir=[directory]     Binaries directory for core binary
+                               [$PWD/bin]
+  --library-dir=[directory]    Library directory for core libraries
+                               [$PWD/lib]
+  --help                       Show this help text and exit
+
+";
+	exit(0);
+}
+
 1;