diff options
| author | Robin Burchell <viroteck@viroteck.net> | 2012-04-12 11:48:32 -0700 |
|---|---|---|
| committer | Robin Burchell <viroteck@viroteck.net> | 2012-04-12 11:48:32 -0700 |
| commit | b1c14f0b7404c3a920eca38ebd25b304cef76ae6 (patch) | |
| tree | 14bc136d8d18bce371e08427e6689d4566584809 | |
| parent | d6067d1d4a313222d251b4ad7f292f154afe5532 (diff) | |
| parent | 4c3e9dc529969fc6bd2e2b1e362603457575020a (diff) | |
Merge pull request #41 from SaberUK/configure-cleanup
Configure cleanup.
| -rw-r--r-- | make/configure.pm | 15 | ||||
| -rw-r--r-- | src/modules/extra/README | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/make/configure.pm b/make/configure.pm index 526f39d29..230bd3934 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -228,7 +228,8 @@ sub is_dir sub showhelp { chomp(my $PWD = `pwd`); - print "Usage: configure [options] + print <<EOH; +Usage: configure [options] *** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE *** *** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING *** @@ -247,29 +248,25 @@ InspIRCd 1.0.x, are also allowed. --disable-interactive Sets no options itself, but will disable any interactive prompting. - --disable-rpath Disable runtime paths. DO NOT USE UNLESS - YOU KNOW WHAT YOU ARE DOING! --update Update makefiles and dependencies - --modupdate Detect new modules and write makefiles --clean Remove .config.cache file and go interactive --enable-gnutls Enable GnuTLS module [no] --enable-openssl Enable OpenSSL module [no] - --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] - --disable-ipv6 Do not build ipv6 native InspIRCd [not set] - --with-cc=[filename] Use an alternative g++ binary to + --disable-ipv6 Do not build IPv6 native InspIRCd [not set] + --with-cc=[filename] Use an alternative compiler to build InspIRCd [g++] --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) + and library dirs as subdirectories of prefix) [$PWD] --config-dir=[directory] Config file directory for config and SSL certs [$PWD/conf] @@ -284,7 +281,7 @@ InspIRCd 1.0.x, are also allowed. --disable-extras=[extras] Disable the specified list of extras --help Show this help text and exit -"; +EOH exit(0); } diff --git a/src/modules/extra/README b/src/modules/extra/README index 6dc9bb18a..2478b57cf 100644 --- a/src/modules/extra/README +++ b/src/modules/extra/README @@ -3,8 +3,7 @@ For example, m_filter_pcre requires the PCRE libraries. To compile any of these modules first ensure you have the required dependencies (read the online documentation at http://wiki.inspircd.org/) and then symlink -the .cpp file from this directory into the parent directory (src/modules/) and -re-configure your inspircd with ./configure -modupdate to detect the new module. +the .cpp file from this directory into the parent directory (src/modules/). Alternatively, use the command: ./configure --enable-extras=m_extra.cpp, which will automatically take care of symlinking the module of that name and any headers it needs |