]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Better detection
[user/henk/code/inspircd.git] / configure
index 949e1848181614eb1b5348b5aaf782d8a81f16a8..4a0556bb39b7f373ea5ddb30559a2886ca28c2fd 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 
 # InspIRCd Configuration Script
 #
-# Copyright 2002-2006 The ChatSpike Development Team
+# Copyright 2002-2007 The ChatSpike Development Team
 # <brain@chatspike.net>
 # <Craig@chatspike.net>
 #
 
 
 require 5.6.0;
+use Socket;
 use Cwd;
 use Getopt::Long;
 
+# Utility functions for our buildsystem
+use make::utilities;
+use make::configure;
+
 GetOptions (
        'enable-gnutls' => \$opt_use_gnutls,
        'enable-openssl' => \$opt_use_openssl,
@@ -25,7 +30,7 @@ GetOptions (
        'with-channel-length=i' => \$opt_chan_length,
        'with-max-channels=i' => \$opt_maxchans,
        'with-max-oper-channels=i' => \$opt_opermaxchans,
-       'with-max-clients' => \$opt_maxclients,
+       'with-max-clients=i' => \$opt_maxclients,
        'enable-epoll' => \$opt_epoll,
        'enable-kqueue' => \$opt_kqueue,
        'disable-epoll' => \$opt_noepoll,
@@ -90,21 +95,21 @@ my $interactive = !$non_interactive;
 
 chomp($topdir = getcwd());
 $this = resolve_directory($topdir);                                            # PWD, Regardless.
-@modlist = ();                                                                 # Declare for Module List..
-%config = ();                                                                  # Initiate Configuration Hash..
-$config{ME}                 = resolve_directory($topdir);                      # Present Working Directory
+@modlist = ();                                                         # Declare for Module List..
+%config = ();                                                          # Initiate Configuration Hash..
+$config{ME}             = resolve_directory($topdir);                  # Present Working Directory
 
-$config{BASE_DIR}           = $config{ME};
+$config{BASE_DIR}         = $config{ME};
 
 if (defined $opt_base_dir)
 {
        $config{BASE_DIR} = $opt_base_dir;
 }
 
-$config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");            # Configuration Directory
-$config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");         # Modules Directory
-$config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");             # Binary Directory
-$config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");             # Library Directory
+$config{CONFIG_DIR}     = resolve_directory($config{BASE_DIR}."/conf");                # Configuration Directory
+$config{MODULE_DIR}     = resolve_directory($config{BASE_DIR}."/modules");             # Modules Directory
+$config{BINARY_DIR}     = resolve_directory($config{BASE_DIR}."/bin");         # Binary Directory
+$config{LIBRARY_DIR}   = resolve_directory($config{BASE_DIR}."/lib");          # Library Directory
 
 if (defined $opt_config_dir)
 {
@@ -129,51 +134,51 @@ if (defined $opt_use_gnutls)
 {
        $config{USE_GNUTLS} = "y";                                              # Use gnutls.
 }
-$config{USE_OPENSSL}        = "n";                                             # Use openssl.
+$config{USE_OPENSSL}   = "n";                                          # Use openssl.
 if (defined $opt_use_openssl)
 {
        $config{USE_OPENSSL} = "y";
 }
 
 # no, let's not change these.
-$config{OPTIMITEMP}         = "0";                                             # Default Optimisation Value
+$config{OPTIMITEMP}     = "0";                                 # Default Optimisation Value
 if (!defined $opt_disable_debug)
 {
-       $config{OPTIMISATI}         = "-g";                                     # Optimisation Flag
+       $config{OPTIMISATI}      = "-g";                                # Optimisation Flag
 }
 else
 {
-       $config{OPTIMISATI}         = "";                                       # DEBUGGING OFF!
+       $config{OPTIMISATI}      = "";                                  # DEBUGGING OFF!
 }
 
-$config{NICK_LENGT}         = "31";                                            # Default Nick Length
+$config{NICK_LENGT}     = "31";                                        # Default Nick Length
 if (defined $opt_nick_length)
 {
        $config{NICK_LENGT} = $opt_nick_length;
 }
-$config{CHAN_LENGT}         = "64";                                            # Default Channel Name Length
+$config{CHAN_LENGT}     = "64";                                        # Default Channel Name Length
 if (defined $opt_chan_length)
 {
        $config{CHAN_LENGT} = $opt_chan_length;
 }
-$config{MAX_CHANNE}         = "20";                                            # Default Max. Channels per user
+$config{MAX_CHANNE}     = "20";                                        # Default Max. Channels per user
 if (defined $opt_maxchans)
 {
        $config{MAX_CHANNE} = $opt_maxchans;
 }
-$config{MAX_OPERCH}         = "60";                                            # Default Max. Channels per oper
+$config{MAX_OPERCH}     = "60";                                                # Default Max. Channels per oper
 if (defined $opt_opermaxchans)
 {
        $config{MAX_OPERCH} = $opt_opermaxchans;
 }
-$config{MAXI_MODES}         = "20";                                            # Default Max. Number of Modes set at once.
+$config{MAXI_MODES}     = "20";                                        # Default Max. Number of Modes set at once.
 if (defined $opt_modes)
 {
        $config{MAXI_MODES} = $opt_modes;
 }
-$config{HAS_STRLCPY}        = "false";                                         # strlcpy Check.
-$config{HAS_STDINT}         = "false";                                         # stdint.h check
-$config{USE_KQUEUE}         = "y";                                             # kqueue enabled
+$config{HAS_STRLCPY}   = "false";                                      # strlcpy Check.
+$config{HAS_STDINT}     = "false";                                             # stdint.h check
+$config{USE_KQUEUE}     = "y";                                         # kqueue enabled
 if (defined $opt_kqueue)
 {
        $config{USE_KQUEUE} = "y";
@@ -182,7 +187,7 @@ if (defined $opt_nokqueue)
 {
        $config{USE_KQUEUE} = "n";
 }
-$config{USE_EPOLL}          = "y";                                             # epoll enabled
+$config{USE_EPOLL}       = "y";                                                # epoll enabled
 if (defined $opt_epoll)
 {
        $config{USE_EPOLL} = "y";
@@ -191,7 +196,7 @@ if (defined $opt_noepoll)
 {
        $config{USE_EPOLL} = "n";
 }
-$config{IPV6}               = "n";                                             # IPv6 support (experimental)
+$config{IPV6}         = "n";                                           # IPv6 support (experimental)
 if (defined $opt_ipv6)
 {
        $config{IPV6} = "y";
@@ -206,10 +211,11 @@ if (defined $opt_noipv6links)
        $config{SUPPORT_IP6LINKS} = "n";
 }
 $config{STATIC_LINK}       = "no";                                             # are doing static modules?
-chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                          # FD Limit
+chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                  # FD Limit
 chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);                       # Hard FD Limit
 chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);                  # Major GCC Version
-chomp($config{OSNAME}       = `uname`);                                        # Operating System Name
+$config{_SOMAXCONN} = SOMAXCONN;                                               # Max connections in accept queue
+$config{OSNAME}            = $^O;                                      # Operating System Name
 $config{CC}                = "g++";                                            # C++ compiler
 if (defined $opt_cc)
 {
@@ -218,13 +224,13 @@ if (defined $opt_cc)
 $exec = $config{CC} . " -dumpversion | cut -c 1";
 chomp($config{GCCVER}       = `$exec`);                                                # Major GCC Version
 $config{MAKEORDER}         = "ircd mods";                                      # build order
-$config{STATICLIBS}         = "";                                              # library archive path
-$config{MAX_IDENT}          = "12";                                            # max ident size
-$config{MAX_QUIT}           = "255";                                           # max quit message size
-$config{MAX_TOPIC}          = "307";                                           # max topic size
-$config{MAX_KICK}           = "255";                                           # max kick message size
-$config{MAX_GECOS}          = "128";                                           # max GECOS size
-$config{MAX_AWAY}           = "200";                                           # max AWAY size
+$config{STATICLIBS}     = "";                                          # library archive path
+$config{MAX_IDENT}       = "12";                                               # max ident size
+$config{MAX_QUIT}         = "255";                                             # max quit message size
+$config{MAX_TOPIC}       = "307";                                              # max topic size
+$config{MAX_KICK}         = "255";                                             # max kick message size
+$config{MAX_GECOS}       = "128";                                              # max GECOS size
+$config{MAX_AWAY}         = "200";                                             # max AWAY size
 if (defined $opt_ident)
 {
        $config{MAX_IDENT} = $opt_ident;
@@ -250,8 +256,6 @@ if (defined $opt_away)
        $config{MAX_AWAY} = $opt_away;
 }
 
-$no_svn = 0;
-
 $config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])?(\-[a-z][0-9])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
 $config{HAS_OPENSSL} = $1;
 
@@ -262,29 +266,16 @@ if ($config{GCCVER} eq "") {
 
 # Minihack! Convert Cygwin to 'Cyg-Static' so i can
 # Keep my dynamic module experiments here for later
-# concideration!
+# consideration!
 
-if ($config{OSNAME} =~ /CYGWIN/)
+if ($config{OSNAME} =~ /CYGWIN/i)
 {
        $config{OSNAME} = "CYG-STATIC";
 }
-elsif($config{OSNAME} =~ /^MINGW32/)
-{
-       $config{OSNAME} = "MINGW32";
-}
-elsif ((!$config{OSNAME}) || ($config{OSNAME} eq ""))
-{
-       chomp($config{OSNAME} = `/usr/bin/uname`);
-       
-       if((!$config{OSNAME}) || ($config{OSNAME} eq ""))
-       {
-               $config{OSNAME} = "Unknown";
-       }       
-}
 
 if (!$config{MAX_CLIENT_T}) { 
-       $config{MAX_CLIENT_T} = 1024;                                 # Set a reasonable 'Default'
-       $fd_scan_fail = "true";                                       # Used Later
+       $config{MAX_CLIENT_T} = 1024;                            # Set a reasonable 'Default'
+       $fd_scan_fail = "true";                                # Used Later
 }
 
 # Get and Set some important vars..
@@ -292,59 +283,73 @@ getmodules();
 
 sub clean
 {
-       if ($arg eq "-clean") {
-               system("rm -rf .config.cache");
-       }
+       system("rm -rf .config.cache");
 }
 
 sub update
 {
-       chomp($topdir = getcwd());
-       $this = resolve_directory($topdir);                                             # PWD, Regardless.
-       getmodules();
-       # Does the cache file exist?
-       if (!getcache()) {
-               # No, No it doesn't.. *BASH*
-               print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-               exit 0;
-       } else {
-               # We've Loaded the cache file and all our variables..
-               print "Updating Files..\n";
-               getosflags();
-               if ($opt_disable_debug == 1)
-               {
-                       print "Disabling debug information (-g).\n";
-                       $config{OPTIMISATI} = "";
+       eval {
+               chomp($topdir = getcwd());
+               $this = resolve_directory($topdir);                                          # PWD, Regardless.
+               getmodules();
+               # Does the cache file exist?
+               if (!getcache()) {
+                       # No, No it doesn't.. *BASH*
+                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+                       exit 0;
+               } else {
+                       # We've Loaded the cache file and all our variables..
+                       print "Updating Files..\n";
                        getosflags();
+                       if ($opt_disable_debug == 1)
+                       {
+                               print "Disabling debug information (-g).\n";
+                               $config{OPTIMISATI} = "";
+                               getosflags();
+                       }
+                       $has_epoll = $config{HAS_EPOLL};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(1);
+                       makecache();
+                       print "Complete.\n";
+                       exit;
                }
-               $has_epoll = $config{HAS_EPOLL};
-               $has_kqueue = $config{HAS_KQUEUE};
-               writefiles(1);
-               print "Complete.\n";
-               exit;
+       };
+       if ($@)
+       {
+               print "Configure update failed: $@\n";
        }
+       exit;
 }
 
 sub modupdate
 {
-       chomp($topdir = getcwd());
-       $this = resolve_directory($topdir);                                             # PWD, Regardless.
-       getmodules();
-        # Does the cache file exist?
-        if (!getcache()) {
-                # No, No it doesn't.. *BASH*
-                print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-                exit 0;
-        } else {
-                # We've Loaded the cache file and all our variables..
-                print "Updating Files..\n";
-                getosflags();
-                $has_epoll = $config{HAS_EPOLL};
-                $has_kqueue = $config{HAS_KQUEUE};
-                writefiles(0);
-                print "Complete.\n";
-                exit;
-        }
+       eval {
+               chomp($topdir = getcwd());
+               $this = resolve_directory($topdir);                                          # PWD, Regardless.
+               getmodules();
+               # Does the cache file exist?
+               if (!getcache()) {
+                       # No, No it doesn't.. *BASH*
+                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+                       exit 0;
+               } else {
+                       # We've Loaded the cache file and all our variables..
+                       print "Updating Files..\n";
+                       getosflags();
+                       $has_epoll = $config{HAS_EPOLL};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(0);
+                       makecache();
+                       print "Complete.\n";
+                       exit;
+               }
+       };
+       if ($@)
+       {
+               print "Module update failed: $@\n";
+       }
+       exit;
 }
 
 
@@ -418,8 +423,8 @@ $has_kqueue = 0;
 $fail = 0;
 open(KQUEUE, "</usr/include/sys/event.h") or $fail = 1;
 if (!$fail) {
-        while (chomp($line = <KQUEUE>)) {
-                # try and find the delcaration of:
+       while (chomp($line = <KQUEUE>)) {
+               # try and find the delcaration of:
                # int kqueue(void);
                if ($line =~ /int(\0x9|\s)+kqueue/) {
                        $has_kqueue = 1;
@@ -441,7 +446,7 @@ if (!$fail) {
 if ($has_epoll) {
        my $kernel = `uname -r`;
        chomp($kernel);
-       if (($kernel =~ /2\.0/) || ($kernel =~ /2\.2/) || ($kernel =~ /2\.4/)) {
+       if (($kernel =~ /^2\.0\./) || ($kernel =~ /^2\.2\./) || ($kernel =~ /^2\.4\./)) {
                $has_epoll = 0;
        }
 }
@@ -474,14 +479,14 @@ if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPE
 }
 
 ################################################################################
-#                          BEGIN INTERACTIVE PART                              #
+#                        BEGIN INTERACTIVE PART                              #
 ################################################################################
 
 # Clear the Screen..
 if ($interactive)
 {
        system("clear");
-       chomp($wholeos = `uname -sr`);
+       $wholeos = $^O;
 
        my $rev = getrevision();
        # Display Introduction Message..
@@ -539,10 +544,10 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        my $tmpbase = $config{BASE_DIR};
        dir_check("do you wish to install the InspIRCd base", "BASE_DIR");
        if ($tmpbase ne $config{BASE_DIR}) {
-               $config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Dir
-               $config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");        # Modules Directory
-               $config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");            # Binary Directory
-               $config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");            # Library Directory
+               $config{CONFIG_DIR}      = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Dir
+               $config{MODULE_DIR}      = resolve_directory($config{BASE_DIR}."/modules");     # Modules Directory
+               $config{BINARY_DIR}      = resolve_directory($config{BASE_DIR}."/bin");     # Binary Directory
+               $config{LIBRARY_DIR}    = resolve_directory($config{BASE_DIR}."/lib");      # Library Directory
        }
 
        dir_check("are the configuration files", "CONFIG_DIR");
@@ -603,262 +608,24 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        print "different servers on the network.\n\n";
 
        # File Descriptor Settings..
-       my $continue = 0;
-       while (!$continue) {
-               print "Maximum number of clients at any one time ($config{MAX_CLIENT_T})\n";
-               print "[\033[1;32m$config{MAX_CLIENT}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_CLIENT};
-               }
-               if ($var =~ /^\d+$/) {
-                       if (($var > $config{MAX_CLIENT_T}) && ($fd_scan_fail ne "true")) {
-                               # Client has entered a larger number than the 'discovered' value
-                               # Confirm.
-                               print "WARNING: Our scans have indicated that you are attempting
-to use more sockets than there are avaliable. Are you sure
-you wish to do this? It may cause the IRCd to malfunction [y/n]
-[\033[1;32mn\033[0m] -> $c";
-                               chomp($tmp = <STDIN>);
-                               if ($tmp ne "y") {
-                                       print "Please enter the correct value.\n\n";
-                                       next;
-                               }
-                       }
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-                       next;
-               }
-               # If we get here, we should be good to go.
-               $config{MAX_CLIENT} = $var;
-               $config{MAX_DESCRIPTORS} = $var;
-               $continue = 1;
-               print "\n";
-       }
-
-       my $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of nicknames?\n";
-               print "[\033[1;32m$config{NICK_LENGT}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{NICK_LENGT};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{NICK_LENGT} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of channel names?\n";
-               print "[\033[1;32m$config{CHAN_LENGT}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{CHAN_LENGT};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{CHAN_LENGT} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum number of channels a normal user may join at any one time?\n";
-               print "[\033[1;32m$config{MAX_CHANNE}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_CHANNE};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_CHANNE} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum number of channels an oper may join at any one time?\n";
-               print "[\033[1;32m$config{MAX_OPERCH}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_OPERCH};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_OPERCH} = $var;
-                       $continue = 1;
-                       print "\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum number of mode changes in one line?\n";
-               print "[\033[1;32m$config{MAXI_MODES}\033[0m] -> ";
-                       chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAXI_MODES};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAXI_MODES} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of an ident (username)?\n";
-               print "[\033[1;32m$config{MAX_IDENT}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_IDENT};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_IDENT} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of a quit message?\n";
-               print "[\033[1;32m$config{MAX_QUIT}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_QUIT};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_QUIT} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of a channel topic?\n";
-               print "[\033[1;32m$config{MAX_TOPIC}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_TOPIC};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_TOPIC} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of a kick message?\n";
-               print "[\033[1;32m$config{MAX_KICK}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_KICK};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_KICK} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
-
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of a GECOS (real name) field?\n";
-               print "[\033[1;32m$config{MAX_GECOS}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_GECOS};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_GECOS} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
+       promptnumeric("number of clients at any one time", "MAX_CLIENT_T");
+       $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
+       $config{MAX_DESCRIPTORS} = $config{MAX_CLIENT_T};
 
-       $continue = 0;
-       while (!$continue) {
-               print "What is the maximum length of an away message?\n";
-               print "[\033[1;32m$config{MAX_AWAY}\033[0m] -> ";
-               chomp($var = <STDIN>);
-               if ($var eq "") {
-                       $var = $config{MAX_AWAY};
-               }
-               if ($var =~ /^\d+$/) {
-                       # We don't care what the number is, set it and be on our way.
-                       $config{MAX_AWAY} = $var;
-                       $continue = 1;
-                       print "\n";
-               } else {
-                       print "You must enter a number in this field. Please try again.\n\n";
-               }
-       }
+       promptnumeric("length of nicknames", "NICK_LENGT");
+       promptnumeric("length of channel names", "CHAN_LENGT");
+       promptnumeric("number of channels a normal user may join at any one time", "MAX_CHANNE");
+       promptnumeric("number of channels an oper may join at any one time", "MAX_OPERCH");
+       promptnumeric("number of mode changes in one line", "MAXI_MODES");
+       promptnumeric("length of an ident (username)", "MAX_IDENT");
+       promptnumeric("length of a quit message", "MAX_QUIT");
+       promptnumeric("length of a channel topic", "MAX_TOPIC");
+       promptnumeric("length of a kick message", "MAX_KICK");
+       promptnumeric("length of a GECOS (real name)", "MAX_GECOS");
+       promptnumeric("length of an away message", "MAX_AWAY");
 }
 
-print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
-print "\033[0mBase install path:\033[1;32m\t\t$config{BASE_DIR}\033[0m\n";
-print "\033[0mConfig path:\033[1;32m\t\t\t$config{CONFIG_DIR}\033[0m\n";
-print "\033[0mModule path:\033[1;32m\t\t\t$config{MODULE_DIR}\033[0m\n";
-print "\033[0mLibrary path:\033[1;32m\t\t\t$config{LIBRARY_DIR}\033[0m\n";
-print "\033[0mMax connections:\033[1;32m\t\t$config{MAX_CLIENT}\033[0m\n";
-print "\033[0mMax User Channels:\033[1;32m\t\t$config{MAX_CHANNE}\033[0m\n";
-print "\033[0mMax Oper Channels:\033[1;32m\t\t$config{MAX_OPERCH}\033[0m\n";
-print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\033[0m\n";
-print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\033[0m\n";
-print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\033[0m\n";
-print "\033[0mMax ident length:\033[1;32m\t\t$config{MAX_IDENT}\033[0m\n";
-print "\033[0mMax quit length:\033[1;32m\t\t$config{MAX_QUIT}\033[0m\n";
-print "\033[0mMax topic length:\033[1;32m\t\t$config{MAX_TOPIC}\033[0m\n";
-print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\033[0m\n";
-print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\033[0m\n";
-print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\033[0m\n";
-print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.x\033[0m\n";
-# and not echo it out so we don't get some ricer fuck complaining
-#print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
-print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n";
-print "\033[0mStatic modules:\033[1;32m\t\t\t$config{STATIC_LINK}\033[0m\n";
-print "\033[0mIPv6 Support:\033[1;32m\t\t\t$config{IPV6}\033[0m\n";
-print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$config{SUPPORT_IP6LINKS}\033[0m\n";
-print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$config{USE_GNUTLS}\033[0m\n";
-print "\033[0mOpenSSL Support:\033[1;32m\t\t$config{USE_OPENSSL}\033[0m\n\n";
+dumphash();
 
 if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
 {
@@ -896,7 +663,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the Private Key may take some time, go grab a  *
 * Coffee. Even better, to generate some more entropy if it  *
 * is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the        *
+* few times and get that HD going :) Then answer the   *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
                        system("certtool --generate-privkey --outfile key.pem");
@@ -936,7 +703,7 @@ if ($config{USE_GNUTLS} eq "y") {
                        print "SSL Certificates Not found, Generating.. \n\n
 *************************************************************
 * Generating the certificates may take some time, go grab a *
-* coffee, or something.                                     *
+* coffee, or something.                                     *
 *************************************************************\n\n";
                        system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
                        system("openssl dhparam -out dhparams.pem 1024");
@@ -959,8 +726,8 @@ if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
 }
 
 getosflags();
-makecache();
 writefiles(1);
+makecache();
 
 print "\n\n";
 print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
@@ -986,7 +753,7 @@ FOO2
 }
 
 ################################################################################
-#                              HELPER FUNCTIONS                                #
+#                            HELPER FUNCTIONS                          #
 ################################################################################
 sub getcache {
        # Retrieves the .config.cache file, and loads values into the main config hash.
@@ -1029,7 +796,7 @@ sub dir_check {
                        # Convert it to a full path..
                        $var = resolve_directory($ENV{HOME} . "/" . $1);
                }
-               elsif ((($config{OSNAME} == "MINGW32") and ($var !~ /^[A-Z]{1}:\\.*/)) and (substr($var,0,1) ne "/"))
+               elsif ((($config{OSNAME} =~ /MINGW32/i) and ($var !~ /^[A-Z]{1}:\\.*/)) and (substr($var,0,1) ne "/"))
                {
                        # Assume relative Path was given.. fill in the rest.
                        $var = $this . "/$var";
@@ -1069,23 +836,25 @@ sub dir_check {
 }
 
 sub getosflags {
-       if ($config{OSNAME} =~ /BSD$/) {
-               $config{LDLIBS} = "-lstdc++";
-               $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+
+       $config{LDLIBS} = "-lstdc++";
+       $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+       $config{MAKEPROG} = "make";
+
+       if ($config{OSNAME} =~ /OpenBSD/i) {
                $config{MAKEPROG} = "gmake";
-               if ($config{OSNAME} eq "OpenBSD") {
-                       chomp($foo = `eg++ -dumpversion | cut -c 1`);
-                       # theyre running the package version of gcc (eg++)... detect it and set up its version numbers.
-                       # if theyre not running this, configure lets the build continue but they probably wont manage to
-                       # compile as this standard version is 2.95.3!
-                       if ($foo ne "") {
-                               $config{CC} = "eg++";
-                               chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path
-                       }
-                       return "OpenBSD";
+               chomp($foo = `eg++ -dumpversion | cut -c 1`);
+               # theyre running the package version of gcc (eg++)... detect it and set up its version numbers.
+               # if theyre not running this, configure lets the build continue but they probably wont manage to
+               # compile as this standard version is 2.95.3!
+               if ($foo ne "") {
+                       $config{CC} = "eg++";
+                       chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path
                }
-               return $config{OSNAME};
-       } else {
+               return "OpenBSD";
+       }
+
+       if ($config{OSNAME} =~ /Linux/i) {
                $config{LDLIBS} = "-ldl -lstdc++";
                $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
                $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
@@ -1106,75 +875,28 @@ sub getosflags {
                        return "Cygwin-Static";
                }
                $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
-               return "Linux";
        }
        
-       if ($config{OSNAME} =~ /SunOS/)
+       if ($config{OSNAME} =~ /SunOS/i)
        {
                # solaris/sunos needs these
                # socket = bsd sockets api
                # nsl = dns stuff
                # rt = POSIX realtime extensions
                # resolv = inet_aton only (why isnt this in nsl?!)
+               $config{MAKEPROG} = "gmake";
                $config{LDLIBS} = $config{LDLIBS} . " -lsocket -lnsl -lrt -lresolv";
                return "Solaris";
        }
        
-       if($config{OSNAME} eq "MINGW32")
+       if($config{OSNAME} =~ /MINGW32/i)
        {
                # All code is position-independent on windows
                $config{FLAGS} =~ s/-fPIC //;
                return "MinGW";
        }
-}
 
-sub is_dir {
-       my ($path) = @_;
-       if (chdir($path)) {
-               chdir($this);
-               return 1;
-       } else {
-               # Just in case..
-               chdir($this);
-               return 0;
-       }
-}
-
-sub getmodules {
-       my $i = 0;
-       print "Detecting modules ";
-       opendir(DIRHANDLE, "src/modules");
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^m_(.+)\.cpp$/)
-               {
-                       $mod = $1;
-                       if ($mod !~ /_static$/) {
-                               $modlist[$i++] = $mod;
-                               print ".";
-                       }
-               }
-       }
-       closedir(DIRHANDLE);
-       print "\nOk, $i modules.\n";
-}
-
-sub getrevision {
-       if ($no_svn) {
-               return "0";
-       }
-       my $data = `svn info`;
-       
-       if ($data eq "") {
-               $no_svn = 1;
-               $rev = "0";
-               return $rev;
-       }
-       $data =~ /Revision: (\d+)/;
-       my $rev = $1;
-       if (!defined($rev)) {
-               $rev = "0";
-       }
-       return $rev;
+       return $config{OSNAME};
 }
 
 sub writefiles {
@@ -1182,7 +904,7 @@ sub writefiles {
        # First File.. inspircd_config.h
        chomp(my $incos = `uname -n -s -r`);
        chomp(my $version = `sh ./src/version.sh`);
-        chomp(my $revision = getrevision());
+       chomp(my $revision = getrevision());
        $version = "$version(r$revision)";
        chomp(my $revision2 = getrevision());
        if ($writeheader == 1)
@@ -1201,6 +923,8 @@ sub writefiles {
 #define VERSION "$version"
 #define REVISION "$revision2"
 #define MAXCLIENTS $config{MAX_CLIENT}
+#define MAXCLIENTS_S "$config{MAX_CLIENT}"
+#define SOMAXCONN_S "$config{_SOMAXCONN}"
 #define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
 #define CHANMAX $CL
@@ -1218,17 +942,17 @@ sub writefiles {
 #define SYSTEM "$incos"
 #define MAXBUF 514
 EOF
-               if ($config{OSNAME} =~ /SunOS/) {
+               if ($config{OSNAME} =~ /SunOS/i) {
                        print FILEHANDLE "#define IS_SOLARIS\n";
                }
-               if ($config{OSNAME} =~ /CYGWIN/) {
+               if ($config{OSNAME} =~ /CYGWIN/i) {
                        print FILEHANDLE "#define IS_CYGWIN\n";
                        print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE        1024\n#endif\n";
                }
-               if ($config{OSNAME} eq "MINGW32") {
+               if ($config{OSNAME} =~ /MINGW32/i) {
                        print FILEHANDLE "#define IS_MINGW\n";
                }
-               if ($config{OSNAME} eq "CYG-STATIC") {
+               if ($config{OSNAME} =~ /CYG-STATIC/i) {
                        print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
                }
                if ($config{STATIC_LINK} eq "yes") {
@@ -1299,13 +1023,24 @@ EOF
        }
        chomp($modules);   # Remove Redundant whitespace..
 
+       opendir(DIRHANDLE, "src/modules");
+       foreach $name (sort readdir(DIRHANDLE)) {
+               if ($name =~ /^m_(.+?)$/) {
+                       if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
+                               closedir(MDIRHANDLE);
+                               $modules .= "$name.so ";
+                       }
+               }
+       }
+       closedir(DIRHANDLE);
+
 
        # Write all .in files.
        my $tmp = "";
        my $file = "";
        my $exe = "inspircd";
 
-       if ($config{OSNAME} =~ /CYGWIN/) {
+       if ($config{OSNAME} =~ /CYGWIN/i) {
                $exe = "inspircd.exe";
        }
 
@@ -1363,7 +1098,7 @@ EOF
                print "Writing static-build \033[1;32msrc/Makefile\033[0m\n";
                write_static_makefile();
                write_static_modules_makefile();
-       } elsif ($config{OSNAME} =~ /CYGWIN/) {
+       } elsif ($config{OSNAME} =~ /CYGWIN/i) {
                print "Writing cygwin-build \033[1;32msrc/Makefile\033[0m\n";
                write_static_makefile();
                write_dynamic_modules_makefile();
@@ -1374,64 +1109,6 @@ EOF
        }
 }
 
-sub getcompilerflags {
-       my ($file) = @_;
-       open(FLAGS, $file);
-       while (<FLAGS>) {
-       if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
-               close(FLAGS);
-                       return $1;
-               }
-       }
-       close(FLAGS);
-       return undef;
-}
-
-sub getlinkerflags {
-       my ($file) = @_;
-       open(FLAGS, $file);
-       while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) {
-                       close(FLAGS);
-                       return $1;
-               }
-       }
-       close(FLAGS);
-       return undef;
-}
-
-sub getdependencies {
-       my ($file) = @_;
-       open(FLAGS, $file);
-       while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) {
-                       close(FLAGS);
-                       return $1;
-               }
-       }
-       close(FLAGS);
-       return undef;
-}
-
-sub resolve_directory {
-       use File::Spec;
-       return File::Spec->rel2abs($_[0]);
-}
-
-sub yesno {
-       my ($flag,$prompt) = @_;
-       print "$prompt [\033[1;32m$config{$flag}\033[0m] -> ";
-       chomp($tmp = <STDIN>);
-       if ($tmp eq "") { $tmp = $config{$flag} }
-
-       if (($tmp eq "") || ($tmp =~ /^y/i)) {
-               $config{$flag} = "y";
-       } else {
-               $config{$flag} = "n";
-        }
-       return;
-}
-
 sub write_static_modules_makefile {
        # Modules Makefile..
        print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
@@ -1495,6 +1172,8 @@ HEADER
                        $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
                        $deps = getdependencies("src/modules/m_".$i.".cpp");
 
+                       #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+
                        ###
                        # Write Entry to the Makefile
                        ###
@@ -1522,6 +1201,7 @@ EOENT
                        print "done\n";
                }
        }
+
        print MODLIST "{0}};\n\n#endif\n";
        close(MODLIST);
 }
@@ -1532,7 +1212,7 @@ sub write_dynamic_modules_makefile {
        open(FILEHANDLE, ">src/modules/Makefile");
        my $extra = "";
 
-       if ($config{OSNAME} =~ /CYGWIN/) {
+       if ($config{OSNAME} =~ /CYGWIN/i) {
                $extra = "../inspircd.dll.a";
        }
 
@@ -1562,43 +1242,81 @@ EOF
        my $crud = "";
 
        foreach $i (@modlist) {
-       ###
-       # Write Entry to the MakeFile
-       ###
-       $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
-       $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
-       $deps = getdependencies("src/modules/m_".$i.".cpp");
-       print FILEHANDLE <<EOCHEESE;
+               ###
+               # Write Entry to the MakeFile
+               ###
+               $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
+               $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
+               $deps = getdependencies("src/modules/m_".$i.".cpp");
+       
+               #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+       
+               print FILEHANDLE <<EOCHEESE;
 m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
        \$(CC) -pipe -I../../include \$(FLAGS) $cmflags -export-dynamic -c m_$i.cpp
        \$(CC) -pipe \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
 
 EOCHEESE
-       $crud = $crud . "       install -m 0700 m_$i.so \$(MODPATH)\n";
+               $crud = $crud . "       install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
 ###
-       # End Write Entry to the MakeFile
-       ###
+               # End Write Entry to the MakeFile
+               ###
+       }
+
+       opendir(DIRHANDLE, "src/modules");
+       foreach $name (sort readdir(DIRHANDLE)) {
+               if ($name =~ /^m_(.+?)$/) {
+                       $crapola = "";
+                       $crap3 = "";
+                       # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
+                       if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
+                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... ";
+                               my $i = 0;
+                               print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h"; 
+                               foreach $fname (sort readdir(MDIRHANDLE)) {
+                                       if ($fname =~ /\.cpp$/) {
+                                               $cmflags = getcompilerflags("src/modules/$name/$fname");
+                                               $liflags = getlinkerflags("src/modules/$name/$fname");
+                                               $deps = getdependencies("src/modules/$name/$fname");
+                                               $oname = $fname;
+                                               $oname =~ s/\.cpp$/.o/g;
+                                               print FILEHANDLE " $name/$oname";
+                                               $crapola = $crapola .  "$name/$oname: $name/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
+                                               $crapola = $crapola .  "        \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $name/$oname -c $name/$fname\n\n";
+                                               $crap3 = $crap3 . " $name/$oname";
+                                               $i++;
+                                       }
+                               }
+                               print "(\033[1;32m$i files found\033[0m)\n";
+                               print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
+                               print FILEHANDLE "\n$crapola\n";
+                               closedir(MDIRHANDLE);
+                               $crud = $crud . "       install -m \$(INSTMODE) $name.so \$(MODPATH)\n";
+                       }
+               }
        }
+       closedir(DIRHANDLE);
+
        print FILEHANDLE "modinst:\n    \@echo \"Installing modules...\"\n" . $crud;
 }
 
 
 sub write_static_makefile {
        open(FH,">src/Makefile") or die("Could not write src/Makefile!");
-        my $i = 0;
-        my @cmdlist = ();
-        opendir(DIRHANDLE, "src");
-        foreach $name (sort readdir(DIRHANDLE)) {
-                if ($name =~ /^cmd_(.+)\.cpp$/) {
-                        $cmdlist[$i++] = $1;
-                }
-        }
-        closedir(DIRHANDLE);
-        my $cmdobjs = "";
+       my $i = 0;
+       my @cmdlist = ();
+       opendir(DIRHANDLE, "src");
+       foreach $name (sort readdir(DIRHANDLE)) {
+               if ($name =~ /^cmd_(.+)\.cpp$/) {
+                       $cmdlist[$i++] = $1;
+               }
+       }
+       closedir(DIRHANDLE);
+       my $cmdobjs = "";
        my $srcobjs = "";
-        foreach my $cmd (@cmdlist) {
-                $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
-                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
+       foreach my $cmd (@cmdlist) {
+               $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
+               $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
        }
        print FH <<EOM;
 # Insp Makefile :p
@@ -1633,7 +1351,7 @@ elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
        # make this work :)
        ###
 
-       if ($config{OSNAME} =~ /CYGWIN/) {
+       if ($config{OSNAME} =~ /CYGWIN/i) {
                print FH <<EOM;
 all: timer.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o snomasks.o inspircd.exe
 
@@ -1679,7 +1397,7 @@ channels.o: channels.cpp ../include/base.h ../include/channels.h ../include/insp
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
 
 mode.o: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES) modes/modeclasses.a
-       \${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS)
+       \${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS)
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
 
 xline.o: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1688,7 +1406,7 @@ xline.o: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ..
 inspstring.o: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
 
-dns.o: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+dns.o: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
 
 base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
@@ -1697,16 +1415,16 @@ base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_conf
 configreader.o: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
 
-commands.o: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
+commands.o: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h $srcobjs
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp $cmdobjs
 
 dynamic.o: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
 
-users.o: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+users.o: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
 
-modules.o: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+modules.o: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
 
 wildcard.o: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1715,10 +1433,10 @@ wildcard.o: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/insp
 socket.o: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
        
-inspsocket.o: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+inspsocket.o: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
 
-timer.o: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+timer.o: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
 
 EOM
@@ -1738,7 +1456,7 @@ sub write_dynamic_makefile {
        opendir(DIRHANDLE, "src");
        foreach $name (sort readdir(DIRHANDLE)) {
                if ($name =~ /^cmd_(.+)\.cpp$/) {
-                       $cmdlist[$i++] = $1;
+                       $cmdlist[$i++] = $1;
                }
        }
        closedir(DIRHANDLE);
@@ -1812,10 +1530,10 @@ libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../incl
 
 libIRCDmode.so: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
-       \${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+       \${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
 
-libIRCDxline.so: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDxline.so: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
 
@@ -1823,7 +1541,7 @@ libIRCDstring.so: inspstring.cpp ../include/base.h ../include/inspstring.h ../in
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDstring.so inspstring.o
 
-libIRCDasyncdns.so: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDasyncdns.so: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
 
@@ -1835,7 +1553,7 @@ libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configread
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
 
-libIRCDcommands.so: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDcommands.so: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
 
@@ -1843,11 +1561,11 @@ libIRCDdynamic.so: dynamic.cpp ../include/base.h ../include/dynamic.h ../include
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdynamic.so dynamic.o
 
-libIRCDusers.so: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDusers.so: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDusers.so users.o
 
-libIRCDmodules.so: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDmodules.so: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
 
@@ -1859,11 +1577,11 @@ libIRCDsocket.so: socket.cpp ../include/base.h ../include/inspircd.h ../include/
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocket.so socket.o
 
-libIRCDinspsocket.so: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+libIRCDinspsocket.so: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDinspsocket.so inspsocket.o
 
-libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
 
@@ -1879,78 +1597,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);
-}