From fdd335625ea715947ff50648c269de4f3136e87a Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Thu, 12 Apr 2012 07:25:05 +0100
Subject: Remove references to old configure commands.

---
 make/configure.pm        | 6 +-----
 src/modules/extra/README | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/make/configure.pm b/make/configure.pm
index 526f39d29..4aa3c18b4 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -247,14 +247,10 @@ 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
@@ -269,7 +265,7 @@ InspIRCd 1.0.x, are also allowed.
                                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]
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
-- 
cgit v1.2.3


From 4c3e9dc529969fc6bd2e2b1e362603457575020a Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Thu, 12 Apr 2012 07:38:20 +0100
Subject: Minor style tweaks.

---
 make/configure.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/configure.pm b/make/configure.pm
index 4aa3c18b4..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  ***
@@ -257,8 +258,8 @@ InspIRCd 1.0.x, are also allowed.
                                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
@@ -280,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);
 }
 
-- 
cgit v1.2.3