Move documentation of configure options in INSTALL.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4725 dbcabf3a-b0e7-0310-adc4-f8d773084564

2 files changed, 33 insertions, 42 deletions

diff --git a/INSTALL b/INSTALL
index 1038d8af..bf46e55d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,8 +16,7 @@ For most people, this should work just fine:
  su
  make install     (not _really_ required except for perl support)
 
-You may want to give some parameters to configure, here's the most
-commonly used ones:
+configure options
 
   --prefix
 
@@ -36,6 +35,36 @@ commonly used ones:
   use /SET resolve_prefer_ipv6 ON. You can also override
   this with /SERVER -4 or -6 options.
 
+  --with-perl=static
+
+  Build Perl support statically to irssi binary
+  (default is to build a module)
+
+  --with-perl-lib=[site|vendor|DIR]
+
+  Specify installation dir for
+  Perl libraries. Site is the default (usually
+  /usr/local/lib/perl/...), vendor uses the path
+  where the base of the perl is installed
+  (/usr/lib/perl/...), or DIR specifies exactly
+  where you want to install it.
+
+  --without-perl
+
+  Disable Perl support
+
+  --with-socks
+
+  Build with socks library
+
+  --with-bot
+
+  Build irssi-bot
+
+  --without-textui
+
+  Build without text frontend
+
 If ncurses is installed in a non-standard path you can specify it with
 --with-ncurses=/path. If anything else is in non-standard path, you can just
 give the paths in CPPFLAGS and LIBS environment variable, eg.:
diff --git a/docs/manual.txt b/docs/manual.txt
index 8a7532d5..9dd298d4 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -7,7 +7,7 @@
  Index
 
 	0. Generic babbling
-	1. Installation
+	1. Command line parameters
 	2. Message levels
 	3. Flood protection
 	4. Configuration
@@ -132,45 +132,7 @@
 	these features down somewhere so people (and me!) would find them.
 
 
- 1. Installation
-
- 1.1 Configuration
-
-	configure script accepts these parameters:
-
-	--enable-ipv6      Enable IPv6 support
-	--disable-curses-windows  Don't use curses windows. Use this if
-	                   screen drawing seems too slow for some reason.
-			   This option may not work properly with all
-			   curseses (solaris8).
-	--enable-memdebug  Enable memory debugging, great for finding
-	                   memory leaks
-
-	--with-perl=static Build Perl support statically to irssi binary
-	                   (default is to build a module)
-	--with-perl-lib=[site|vendor|DIR]  Specify installation dir for
-	                   Perl libraries. Site is the default (usually
-			   /usr/local/lib/perl/...), vendor uses the path
-			   where the base of the perl is installed
-			   (/usr/lib/perl/...), or DIR specifies exactly
-			   where you want to install it.
-	--without-perl     Disable Perl support
-
-	--with-socks       Build with socks library
-	--with-bot         Build irssi-bot
-	--with-proxy       Build irssi-proxy module
-	--without-textui   Build without text frontend
-	--with-servertest  Build test irc server which you can use to try
-	                   crash irc clients
-
-	In short:
-
-	./configure
-	make
-	make install
-
-
- 1.2 Command line parameters
+ 1. Command line parameters
 
 	--connect -c <server>	Connect to server at startup
 	--port -p <port>	 - specify port