]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Windows support. Tested and working to compile on freebsd and linux. Next step is...
[user/henk/code/inspircd.git] / configure
index 2fda86dd55bfea58810b9307d550028aee40849f..e1bcc153d55f46b65f769f3724ac3a115c72245a 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,10 +2,13 @@
 
 # InspIRCd Configuration Script
 #
-# Copyright 2002-2006 The ChatSpike Development Team
+# Copyright 2002-2007 The ChatSpike Development Team
 # <brain@chatspike.net>
 # <Craig@chatspike.net>
 #
+# Licensed under GPL, please see the COPYING file
+# for more information
+#
 # [14:21] Brain: <matrix impression> i know perl-fu!
 #
 # $Id$
 ########################################
 
 require 5.6.0;
+use Socket;
 use Cwd;
 use Getopt::Long;
 
+# Utility functions for our buildsystem
+use make::utilities;
+use make::configure;
+use make::gnutlscert;
+use make::opensslcert;
+
 GetOptions (
        'enable-gnutls' => \$opt_use_gnutls,
+       'rebuild' => \$opt_rebuild,
        'enable-openssl' => \$opt_use_openssl,
        'disable-interactive' => \$opt_nointeractive,
        'with-nick-length=i' => \$opt_nick_length,
        '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,
-       'enable-optimization' => \$opt_optimise,
+       'with-max-clients=i' => \$opt_maxclients,
+       'enable-ports' => \$opt_ports,
        'enable-epoll' => \$opt_epoll,
        'enable-kqueue' => \$opt_kqueue,
+       'disable-ports' => \$opt_noports,
        'disable-epoll' => \$opt_noepoll,
        'disable-kqueue' => \$opt_nokqueue,
        'enable-ipv6' => \$opt_ipv6,
@@ -37,6 +47,7 @@ GetOptions (
        'with-ident-length=i' => \$opt_ident,
        'with-quit-length=i' => \$opt_quit,
        'with-topic-length=i' => \$opt_topic,
+       'with-maxbuf=i' => \$opt_maxbuf,
        'with-kick-length=i' => \$opt_kick,
        'with-gecos-length=i' => \$opt_gecos,
        'with-away-length=i' => \$opt_away,
@@ -46,6 +57,7 @@ GetOptions (
        'module-dir=s' => \$opt_module_dir,
        'binary-dir=s' => \$opt_binary_dir,
        'library-dir=s' => \$opt_library_dir,
+       'disable-debuginfo' => sub { $opt_disable_debug = 1 },
        'help'  => sub { showhelp(); },
        'modupdate' => sub { modupdate(); },
        'update' => sub { update(); },
@@ -75,14 +87,16 @@ my $non_interactive = (
        (defined $opt_noipv6links) ||
        (defined $opt_kqueue) ||
        (defined $opt_epoll) ||
+       (defined $opt_ports) ||
        (defined $opt_maxchans) ||
        (defined $opt_opermaxchans) ||
        (defined $opt_chan_length) ||
        (defined $opt_nick_length) ||
-       (defined $opt_optimise) ||
        (defined $opt_use_openssl) ||
        (defined $opt_nokqueue) ||
        (defined $opt_noepoll) ||
+       (defined $opt_noports) ||
+       (defined $opt_maxbuf) ||
        (defined $opt_use_gnutls)
 );
 my $interactive = !$non_interactive;
@@ -90,21 +104,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)
 {
@@ -123,52 +137,49 @@ if (defined $opt_library_dir)
        $config{LIBRARY_DIR} = $opt_library_dir;
 }
 chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL}  = `openssl version 2>/dev/null`);                  # Openssl version
+chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);          # Openssl version
+chomp($gnutls_ver = $config{HAS_GNUTLS});
+chomp($openssl_ver = $config{HAS_OPENSSL});
 $config{USE_GNUTLS}        = "n";
 if (defined $opt_use_gnutls)
 {
-       $config{USE_GNUTLS} = "y";                                              # 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";
 }
-$config{OPTIMITEMP}         = "0";                                             # Default Optimisation Value
-$config{OPTIMISATI}         = "-g";                                            # Optimisation Flag
-if (defined $opt_optimise)
+
+# no, let's not change these.
+$config{OPTIMITEMP}     = "0";                                         # Default Optimisation Value
+if (!defined $opt_disable_debug)
+{
+       $config{OPTIMISATI}      = "-g1";                               # Optimisation Flag
+}
+else
 {
-       $config{OPTIMISATI} = "-O" . $opt_optimise;
-       $config{OPTIMITEMP} = $opt_optimise;
+       $config{OPTIMISATI}      = "-O2";                               # 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
-if (defined $opt_maxchans)
-{
-       $config{MAX_CHANNE} = $opt_maxchans;
-}
-$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";
@@ -177,7 +188,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";
@@ -186,12 +197,21 @@ if (defined $opt_noepoll)
 {
        $config{USE_EPOLL} = "n";
 }
-$config{IPV6}               = "n";                                             # IPv6 support (experimental)
+$config{USE_PORTS}       = "y";                                        # epoll enabled
+if (defined $opt_ports)
+{
+       $config{USE_PORTS} = "y";
+}
+if (defined $opt_noports)
+{
+       $config{USE_PORTS} = "n";
+}
+$config{IPV6}         = "n";                                           # IPv6 support (experimental)
 if (defined $opt_ipv6)
 {
        $config{IPV6} = "y";
 }
-$config{SUPPORT_IP6LINKS}   = "y";                                             # IPv4 supporting IPv6 links (experimental)
+$config{SUPPORT_IP6LINKS}   = "y";                                     # IPv4 supporting IPv6 links (experimental)
 if (defined $opt_ipv6links)
 {
        $config{SUPPORT_IP6LINKS} = "y";
@@ -200,26 +220,33 @@ 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_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{STATIC_LINK}       = "no";                                     # are doing static modules?
+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
+$config{_SOMAXCONN} = SOMAXCONN;                                       # Max connections in accept queue
+$config{OSNAME}            = $^O;                                      # Operating System Name
+$config{IS_DARWIN}          = "NO";                                    # Is OSX?
+if ($config{OSNAME} =~ /darwin/i)
+{
+       $config{IS_DARWIN} = "YES";
+}
 $config{CC}                = "g++";                                            # C++ compiler
 if (defined $opt_cc)
 {
        $config{CC} = $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
+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{MAXBUF}                        = "512";                                # Max buffer size
 if (defined $opt_ident)
 {
        $config{MAX_IDENT} = $opt_ident;
@@ -245,9 +272,7 @@ if (defined $opt_away)
        $config{MAX_AWAY} = $opt_away;
 }
 
-$no_svn = 0;
-
-$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
+$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
 $config{HAS_OPENSSL} = $1;
 
 if ($config{GCCVER} eq "") {
@@ -257,29 +282,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..
@@ -287,53 +299,75 @@ 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();
-               $has_epoll = $config{HAS_EPOLL};
-               $has_kqueue = $config{HAS_KQUEUE};
-               writefiles(1);
-               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();
+                       if ($opt_disable_debug == 1)
+                       {
+                               print "Disabling debug information (-g).\n";
+                               $config{OPTIMISATI} = "";
+                               getosflags();
+                       }
+                       $has_epoll = $config{HAS_EPOLL};
+                       $has_ports = $config{HAS_PORTS};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(1);
+                       makecache();
+                       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_ports = $config{HAS_PORTS};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(0);
+                       makecache();
+                       print "Complete.\n";
+                       exit;
+               }
+       };
+       if ($@)
+       {
+               print "Module update failed: $@\n";
+       }
+       exit;
 }
 
 
@@ -346,9 +380,13 @@ sub svnupdate
                print "This is not an SVN copy of InspIRCd.\n";
                exit;
        }
+       else
+       {
+               close(FH);
+       }
        system("svn update");
        system("perl configure -update");
-       if ($ARGV[1] eq "rebuild") {
+       if (defined $opt_rebuild) {
                system("make install");
        }
        exit;
@@ -407,8 +445,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;
@@ -430,13 +468,29 @@ 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;
        }
 }
 print "yes\n" if $has_epoll == 1;
 print "no\n" if $has_epoll == 0;
 
+printf "Checking if Solaris I/O completion ports are available... ";
+$has_ports = 0;
+my $system = `uname -s`;
+chomp ($system);
+$has_ports = 1 if ($system eq "SunOS");
+
+if ($has_ports) {
+       my $kernel = `uname -r`;
+       chomp($kernel);
+       if (($kernel !~ /^5\.10/)) {
+               $has_ports = 0;
+       }
+}
+print "yes\n" if $has_ports == 1;
+print "no\n" if $has_ports == 0;
+
 if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
        $config{HAS_STRLCPY} = "true";
 }
@@ -463,14 +517,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..
@@ -528,10 +582,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");
@@ -547,7 +601,11 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                yesno(USE_EPOLL,"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
                print "\n";
        }
-       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y"));
+       if ($has_ports) {
+               yesno(USE_PORTS,"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
+               print "\n";
+       }
+       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
        if (!$chose_hiperf) {
                print "No high-performance socket engines are available, or you chose\n";
                print "not to enable one. Defaulting to select() engine.\n\n";
@@ -557,18 +615,20 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        print "\n";
 
        if ($config{IPV6} eq "y") {
-               print "You have chosen to build an \033[1;32mIPV6-only\033[0m server.\nTo accept IPV4 users, you must use the '::ffff:' notation of addresses.\n\n";
+               print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
                $config{SUPPORT_IP6LINKS} = "y";
        } else {
-               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers which are using '::ffff:' notation?\nIf you are using a recent operating\nsystem and are unsure, answer yes.");
+               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
                print "\n";
        }
 
        if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
-               print "I have detected both GnuTLS and OpenSSL on your system.\n";
+               print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
                print "I will default to GnuTLS. If you wish to use OpenSSL\n";
                print "instead, you should enable the OpenSSL module yourself\n";
                print "by copying it from src/modules/extra to src/modules.\n\n";
+               print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
+               print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
        }
 
        if ($config{HAS_GNUTLS} eq "y") {
@@ -582,6 +642,9 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                        print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
                }
        }
+       else {
+               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+       }
 
        print "\nThe following questions will ask you for various figures relating\n";
        print "To your IRCd install. Please note that these should usually be left\n";
@@ -592,291 +655,22 @@ 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_failed 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;
-               $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";
-               }
-       }
-
-       $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";
-               }
-       }
-
-       # Code Optimisation
-       print "Enter the Level Of Binary optimisation. This is a number between 0 and 3.
-The InspIRCd Team will NOT support any bug reports above 0. Also note,
-the IRCd behaviour will be different depending on this value. Please
-read the documentation for more information.
-
-The higher the number, the more optimised your binary will be. This
-value will default to 0 if you either don't enter a number, or enter
-a value outside the range.
-
-As always, if you are unsure, just press enter and accept the default.\n\n";
-       print "[\033[1;32m$config{OPTIMITEMP}\033[0m] -> ";
-       chomp($var = <STDIN>);
-       if ($var eq "") {
-               $var = $config{OPTIMITEMP};
-       }
+       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};
 
-       if ($var eq "1") {
-               $config{OPTIMITEMP} = 1;
-               $config{OPTIMISATI} = "-O";
-       } elsif ($var eq "2") {
-               $config{OPTIMITEMP} = 2;
-               $config{OPTIMISATI} = "-O2";
-       } elsif ($var eq "3") {
-               $config{OPTIMITEMP} = 3;
-               $config{OPTIMISATI} = "-O3";
-       } else {
-               $config{OPTIMITEMP} = 0;
-               $config{OPTIMISATI} = "-g";
-       }
+       promptnumeric("length of nicknames", "NICK_LENGT");
+       promptnumeric("length of channel names", "CHAN_LENGT");
+       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";
-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"))
 {
@@ -897,7 +691,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_gnutls.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -917,8 +710,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * 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");
-                       system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
+                       make_gnutls_cert();
                        print "\nCertificate generation complete, copying to config directory... ";
                        system("mv key.pem $config{CONFIG_DIR}/key.pem");
                        system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -939,7 +731,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_openssl.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -956,8 +747,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the certificates may take some time, go grab a *
 * 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");
+                       make_openssl_cert();
                        print "\nCertificate generation complete, copying to config directory... ";
                        system("mv key.pem $config{CONFIG_DIR}/key.pem");
                        system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -977,8 +767,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";
@@ -1004,7 +794,7 @@ FOO2
 }
 
 ################################################################################
-#                              HELPER FUNCTIONS                                #
+#                            HELPER FUNCTIONS                          #
 ################################################################################
 sub getcache {
        # Retrieves the .config.cache file, and loads values into the main config hash.
@@ -1014,7 +804,7 @@ sub getcache {
                # Ignore Blank lines, and comments..
                next if /^\s*$/;
                next if /^\s*#/;
-               my ($key, $value) = split("=", $_);
+               my ($key, $value) = split("=", $_, 2);
                $value =~ /^\"(.*)\"$/;
                # Do something with data here!
                $config{$key} = $1;
@@ -1047,7 +837,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";
@@ -1087,34 +877,45 @@ sub dir_check {
 }
 
 sub getosflags {
-       if ($config{OSNAME} =~ /BSD$/) {
-               $config{LDLIBS} = "-lstdc++";
-               $config{FLAGS}  = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+
+       $config{LDLIBS} = "-lstdc++";
+       $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+       $config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -g";
+       $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
+       $config{MAKEPROG} = "make";
+
+       if ($config{OSNAME} =~ /darwin/i) {
+               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
+               $config{LDLIBS} = "-ldl -lstdc++";
+       }
+
+       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}  = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
                $config{MAKEPROG} = "make";
                if ($config{OSNAME} =~ /CYGWIN/) {
-                       $config{FLAGS}  = "-Wall -Woverloaded-virtual $config{OPTIMISATI}";
+                       $config{FLAGS}  = "-fno-strict-aliasing -Wall -Woverloaded-virtual $config{OPTIMISATI}";
                        $config{LDLIBS} = "";
                        $config{MAKEPROG} = "/usr/bin/make";
                        $config{MAKEORDER} = "ircd mods";
                        return "Cygwin";
                } elsif ($config{OSNAME} eq "CYG-STATIC") {
-                       $config{FLAGS} = "-Wall -Woverloaded-virtual $config{OPTIMISATI}";
+                       $config{FLAGS} = "-fno-strict-aliasing -Wall -Woverloaded-virtual $config{OPTIMISATI}";
                        $config{LDLIBS} = "";
                        $config{MAKEPROG} = "/usr/bin/make";
                        $config{MAKEORDER} = "mods ircd";
@@ -1122,84 +923,36 @@ sub getosflags {
                        $config{STATIC_LINK} = "yes";
                        return "Cygwin-Static";
                }
-               return "Linux";
+               $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
        }
        
-       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 {
        my($writeheader) = @_;
        # First File.. inspircd_config.h
        chomp(my $incos = `uname -n -s -r`);
-       chomp(my $version = `sh ./src/version.sh`);
-        chomp(my $revision = getrevision());
-       $version = "$version(r$revision)";
+       chomp($version = `sh src/version.sh`);
        chomp(my $revision2 = getrevision());
        if ($writeheader == 1)
        {
@@ -1212,16 +965,20 @@ sub writefiles {
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
 
+/* this is for windows support. */
+#define CoreExport /**/
+#define DllExport /**/
+
 #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #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
-#define MAXCHANS $config{MAX_CHANNE}
-#define OPERMAXCHANS $config{MAX_OPERCH}
 #define MAXMODES $config{MAXI_MODES}
 #define IDENTMAX $config{MAX_IDENT}
 #define MAXQUIT $config{MAX_QUIT}
@@ -1232,19 +989,20 @@ sub writefiles {
 #define OPTIMISATION $config{OPTIMITEMP}
 #define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
-#define MAXBUF 514
 EOF
-               if ($config{OSNAME} =~ /SunOS/) {
+print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
+
+               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") {
@@ -1276,6 +1034,11 @@ EOF
                        $se = "socketengine_epoll";
                        $use_hiperf = 1;
                }
+               if (($has_ports) && ($config{USE_PORTS} eq "y")) {
+                       print FILEHANDLE "#define USE_PORTS\n";
+                       $se = "socketengine_ports";
+                       $use_hiperf = 1;
+               }
                # user didn't choose either epoll or select for their OS.
                # default them to USE_SELECT (ewwy puke puke)
                if (!$use_hiperf) {
@@ -1315,18 +1078,46 @@ 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";
        }
 
        opendir(DIRHANDLE, $this);
 
+       # Do this once here, and cache it in the .*.inc files,
+       # rather than attempting to read src/version.sh from
+       # compiled code -- we might not have the source to hand.
+       # Fix for bug#177 by Brain.
+
+       chomp(my $version = `sh ./src/version.sh`);
+       chomp(my $revision = getrevision());
+       $version = "$version(r$revision)";
+
+       my $LIBEXT = "so";
+       if ($config{IS_DARWIN} eq "YES")
+       {
+               $LIBEXT = "dylib";
+       }
+       # We can actually parse any file starting with . and ending with .inc,
+       # but right now we only parse .inspircd.inc to form './inspircd'
+
        foreach $name (sort readdir(DIRHANDLE)) {
                if ($name =~ /^\.(.+)\.inc$/) {
                        $file = $1;
@@ -1341,16 +1132,19 @@ EOF
                        $tmp =~ s/\@CC\@/$config{CC}/;
                        $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
                        $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
+                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
                        $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
                        $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
                        $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
                        $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
                        $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
                        $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
+                       $tmp =~ s/\@LIBRARY_EXT\@/$LIBEXT/;
                        $tmp =~ s/\@MODULES\@/$modules/;
                        $tmp =~ s/\@EXECUTABLE\@/$exe/;
                        $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
                        $tmp =~ s/\@STATICLIBS\@/$config{STATICLIBS}/;
+                       $tmp =~ s/\@VERSION\@/$version/;
 
                        print "Writing \033[1;32m$file\033[0m\n";
                        open(FILEHANDLE, ">$file");
@@ -1366,7 +1160,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();
@@ -1377,51 +1171,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 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";
@@ -1483,12 +1232,15 @@ HEADER
                if ($i !~ /_static$/) {
                        $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";
 
                        ###
                        # Write Entry to the Makefile
                        ###
                        print FILEHANDLE <<EOCHEESE;
-m_$i.o: .m_$i\_static.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h
+m_$i.o: .m_$i\_static.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h $deps
        \$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c .m_$i\_static.cpp
        mv .m_$i\_static.o ../m_$i.o
 
@@ -1511,6 +1263,7 @@ EOENT
                        print "done\n";
                }
        }
+
        print MODLIST "{0}};\n\n#endif\n";
        close(MODLIST);
 }
@@ -1521,7 +1274,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";
        }
 
@@ -1551,42 +1304,95 @@ 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");
-       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
+               ###
+               # 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) \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
+EOCHEESE
+
+if ($config{OSNAME} =~ /darwin/) {
+               print FILEHANDLE <<EOCHEESE;
+       \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle $liflags -o m_$i.so m_$i.o $extra
+
+EOCHEESE
+} else {
+               print FILEHANDLE <<EOCHEESE;
+       \$(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";
+                               if ($config{IS_DARWIN} eq "YES") {
+                                       print FILEHANDLE "\n    \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle -o $name.so $crap3\n"; 
+                               } else {
+                                       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
@@ -1611,6 +1417,9 @@ if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
 elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
        $se = "socketengine_epoll";
 }
+elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+       $se = "socketengine_ports";
+}
 
        ###
        # This next section is for cygwin dynamic module builds.
@@ -1621,22 +1430,22 @@ 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 aes.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
+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
 
 inspircd.exe: inspircd.dll.a
        \$(CC) -o \$@ \$^
 
-inspircd.dll inspircd.dll.a: inspircd.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 hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o snomasks.o
+inspircd.dll inspircd.dll.a: inspircd.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 hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o timer.o snomasks.o
        \$(CC) -shared -Wl,--out-implib=inspircd.dll.a -o inspircd.dll \$^
 EOM
        } else {
                print FH <<EOM;
-all: timer.o aes.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 \$(MODULES) inspircd.exe
+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 \$(MODULES) inspircd.exe
 
 inspircd.exe: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/base.h
-       \$(CC) -I../include \$(FLAGS) inspircd.cpp -o inspircd.exe \$(LDLIBS) channels.o mode.o xline.o inspstring.o dns.o base.o inspsocket.o configreader.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o snomasks.o modes/modeclasses.a \$(MODULES)
+       \$(CC) -I../include \$(FLAGS) inspircd.cpp -o inspircd.exe \$(LDLIBS) channels.o mode.o xline.o inspstring.o dns.o base.o inspsocket.o configreader.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o timer.o snomasks.o modes/modeclasses.a \$(MODULES)
 EOM
        }
 
@@ -1660,14 +1469,14 @@ socketengine.o: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h
 hashcomp.o: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
 
-helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
 
 channels.o: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(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
@@ -1676,7 +1485,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
@@ -1685,16 +1494,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/commands.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
@@ -1703,13 +1512,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
 
-aes.o: aes.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c aes.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
@@ -1729,7 +1535,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);
@@ -1748,6 +1554,9 @@ sub write_dynamic_makefile {
        elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
                $se = "socketengine_epoll";
        }
+       elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+               $se = "socketengine_ports";
+       }
 
        open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;
@@ -1764,183 +1573,215 @@ CXXFLAGS = -I../include \${FLAGS}
 CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
 RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
 
-all: libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
+EOM
+
+if ($config{IS_DARWIN} eq "YES") {
+       print FH <<EOM;
+all: libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDsnomasks.dylib inspircd
+
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h $cmdobjs libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDsnomasks.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp
+       \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDhash.dylib libIRCDsocket.dylib libIRCDsocketengine.dylib libIRCDuserprocess.dylib libIRCDcull_list.dylib libIRCDcommand_parse.dylib libIRCDtimer.dylib libIRCDsnomasks.dylib
+
+libIRCDsocketengine.dylib: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $se.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocketengine.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocketengine.dylib socketengine.o $se.o
+
+libIRCDsnomasks.dylib: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsnomasks.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsnomasks.dylib snomasks.o
 
-inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
-       \$(CC) -I../include $extra -Wl,--rpath -Wl,/usr/local/lib -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDaes.so libIRCDtimer.so libIRCDsnomasks.so
+libIRCDcommand_parse.dylib: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcommand_parse.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommand_parse.dylib command_parse.o
+
+libIRCDcull_list.dylib: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcull_list.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcull_list.dylib cull_list.o
+
+libIRCDuserprocess.dylib: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDuserprocess.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDuserprocess.dylib userprocess.o
+
+libIRCDhash.dylib: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhash.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhash.dylib hashcomp.o
+
+libIRCDhelper.dylib: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhelper.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhelper.dylib helperfuncs.o
+
+libIRCDchannels.dylib: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDchannels.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDchannels.dylib channels.o
+
+libIRCDmode.dylib: 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" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDmode.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmode.dylib mode.o modes/modeclasses.a
+
+libIRCDxline.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDxline.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDxline.dylib xline.o
+
+libIRCDstring.dylib: 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
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDstring.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDstring.dylib inspstring.o
+
+libIRCDasyncdns.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDasyncdns.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDasyncdns.dylib dns.o
+
+libIRCDbase.dylib: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDbase.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDbase.dylib base.o
+
+libIRCDconfigreader.dylib: 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
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDconfigreader.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDconfigreader.dylib configreader.o
+
+libIRCDcommands.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDcommands.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommands.dylib commands.o
+
+libIRCDdynamic.dylib: 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
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDdynamic.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDdynamic.dylib dynamic.o
+
+libIRCDusers.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDusers.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDusers.dylib users.o
+
+libIRCDmodules.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDmodules.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmodules.dylib modules.o
+
+libIRCDwildcard.dylib: wildcard.cpp ../include/base.h ../include/wildcard.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 wildcard.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDwildcard.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDwildcard.dylib wildcard.o
+
+libIRCDsocket.dylib: 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
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocket.dylib socket.o
+
+libIRCDinspsocket.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDinspsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDinspsocket.dylib inspsocket.o
+
+libIRCDtimer.dylib: 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 -install_name $config{LIBRARY_DIR}/libIRCDtimer.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDtimer.dylib timer.o
+
+EOM
+
+} else {
+
+       print FH <<EOM;
+all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
+
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
+       \$(CC) -pipe -I../include $extra -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
 
 libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
 
 libIRCDsnomasks.so: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
-        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
-         \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
 
 libIRCDcommand_parse.so: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommand_parse.so command_parse.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommand_parse.so command_parse.o
 
 libIRCDcull_list.so: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcull_list.so cull_list.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcull_list.so cull_list.o
 
 libIRCDuserprocess.so: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDuserprocess.so userprocess.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDuserprocess.so userprocess.o
 
 libIRCDhash.so: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
 
-libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
+libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
 
 libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
 
 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)"
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
+       \${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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
 
 libIRCDstring.so: 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
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDstring.so inspstring.o
+       \$(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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
 
 libIRCDbase.so: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
 
 libIRCDconfigreader.so: 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
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
 
-libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
 
 libIRCDdynamic.so: 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
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdynamic.so dynamic.o
+       \$(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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDusers.so users.o
+       \$(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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
 
 libIRCDwildcard.so: wildcard.cpp ../include/base.h ../include/wildcard.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 wildcard.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDwildcard.so wildcard.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDwildcard.so wildcard.o
 
 libIRCDsocket.so: 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
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocket.so socket.o
+       \$(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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDinspsocket.so inspsocket.o
-
-libIRCDaes.so: aes.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c aes.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDaes.so aes.o
+       \$(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) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
 
 EOM
+}
        foreach my $cmd (@cmdlist) {
                print FH <<ITEM;
 cmd_$cmd.so: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o cmd_$cmd.so cmd_$cmd.o
+       \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
 
 ITEM
        }
        close(FH);
 }
 
-sub showhelp
-{
-       chomp($PWD = `pwd`);
-       print "Usage: configure [options]
-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);
-}