]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Add docs for m_httpd and m_http_stats
[user/henk/code/inspircd.git] / configure
index 9e34de613adee70bace95f47aa5f35e410ae6b38..ceac058476349881f291d5eb3ca62a17168e4f50 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 # InspIRCd Configuration Script
 #
 # Copyright 2003 The ChatSpike Development Team
@@ -21,6 +22,10 @@ $config{CONFIG_DIR}         = resolve_directory($config{ME}."/conf");                # Configu
 $config{MODULE_DIR}         = resolve_directory($config{ME}."/modules");       # Modules Directory
 $config{BINARY_DIR}         = resolve_directory($config{ME}."/bin");           # Binary Directory
 $config{LIBRARY_DIR}        = resolve_directory($config{ME}."/lib");           # Library Directory
+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
+$config{USE_GNUTLS}         = "n";                                             # Use gnutls.
+$config{USE_OPENSSL}        = "n";                                             # Use openssl.
 $config{OPTIMITEMP}         = "0";                                             # Default Optimisation Value
 $config{OPTIMISATI}         = "-g";                                            # Optimisation Flag
 $config{NICK_LENGT}         = "31";                                            # Default Nick Length
@@ -29,16 +34,20 @@ $config{MAX_CHANNE}         = "20";                                         # Default Max.
 $config{MAX_OPERCH}         = "60";                                            # Default Max. Channels per oper
 $config{MAXI_MODES}         = "20";                                            # Default Max. Number of Modes set at once.
 $config{HAS_STRLCPY}        = "false";                                         # strlcpy Check.
+$config{HAS_STDINT}         = "false";                                         # stdint.h check
+$config{HAS_EXECINFO}       = "0";                                             # execinfo.h Check.
 $config{USE_KQUEUE}         = "y";                                             # kqueue enabled
 $config{USE_EPOLL}          = "y";                                             # epoll enabled
-$config{THREADED_DNS}       = "n";                                             # threaded dns (experimental)
+$config{THREADED_DNS}       = "n";                                             # threaded dns
+$config{IPV6}               = "n";                                             # IPv6 support (experimental)
+$config{SUPPORT_IP6LINKS}   = "y";                                             # IPv4 supporting IPv6 links (experimental)
 $config{STATIC_LINK}       = "no";                                             # are doing static modules?
 chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                          # FD Limit
-chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);                  # Major GCC Version
-chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);                  # Minor GCC Version
+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}       = `/bin/uname`);                                   # Operating System Name
 $config{CC}                = "g++";                                            # C++ compiler
-$config{MAKEORDER}         = "ircd mods config bininst";                       # build order
+$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
@@ -47,40 +56,95 @@ $config{MAX_KICK}           = "255";                                                # max kick message size
 $config{MAX_GECOS}          = "128";                                           # max GECOS size
 $config{MAX_AWAY}           = "200";                                           # max AWAY size
 
+$no_svn = 0;
+
+$config{HAS_OPENSSL} =~ /OpenSSL (\S+) \d+ \S+ \d{4}/;
+$config{HAS_OPENSSL} = $1;
+
+if ($config{GCCVER} eq "") {
+       print "g++ was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
+       exit;
+}
+
+# Minihack! Convert Cygwin to 'Cyg-Static' so i can
+# Keep my dynamic module experiments here for later
+# concideration!
+
+if ($config{OSNAME} =~ /CYGWIN/) {
+       $config{OSNAME} = "CYG-STATIC";
+}
+
 if ((!$config{OSNAME}) || ($config{OSNAME} eq "")) {
-  chomp($config{OSNAME} = `/usr/bin/uname`);
-  if ((!$config{OSNAME}) || ($config{OSNAME} eq "")){
-       $config{OSNAME} = "Unknown";
-  }
+       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..
 getmodules();
 
 my $arg = $ARGV[0];                                            # Do Some Argument Checks..
-if ($arg eq "-clean") { `rm -rf .config.cache`; }               # Remove the config.cache file.
+if ($arg eq "-clean") {
+       system("rm -rf .config.cache");
+}               # Remove the config.cache file.
 
 if ($arg eq "-update") {
-  # 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();
-    print "Complete.\n";
-    exit;
-  }
+       # 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;
+       }
+}
+
+if ($arg eq "-modupdate") {
+        # 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;
+        }
+}
+
+
+
+if ($arg eq "-svnupdate") {
+       my $fail = 0;
+       open(FH,"<.svn/entries") or $fail = 1;
+       if ($fail) {
+               print "This is not an SVN copy of InspIRCd.\n";
+               exit;
+       }
+       system("svn update");
+       system("perl configure -update");
+       if ($ARGV[1] eq "rebuild") {
+               system("make install");
+       }
+       exit;
 }
 
 print "Checking for cache from previous configure...\n";
@@ -89,25 +153,33 @@ print "Checking operating system version...\n";
 getosflags();
 
 if (!$config{MAX_CLIENT}) { 
-  # If the cache hasn't set the max clients, copy the variable of MAX_CLIENT_T, this
-  # allows us to keep _T for testing purposes. (ie. "Are you sure you want to go
-  # higher than the found value" :))
-  $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
+       # If the cache hasn't set the max clients, copy the variable of MAX_CLIENT_T, this
+       # allows us to keep _T for testing purposes. (ie. "Are you sure you want to go
+       # higher than the found value" :))
+       $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
 }
 
+printf "Checking if stdint.h exists... ";
+$config{HAS_STDINT} = "true";
+my $fail = 0;
+open(STDINT, "</usr/include/stdint.h") or $config{HAS_STDINT} = "false";
+if ($config{HAS_STDINT} eq "true") {
+       close(STDINT);
+}
+print "yes\n" if $config{HAS_STDINT} eq "true";
+print "no\n" if $config{HAS_STDINT} eq "false";
+
+
 printf "Checking if strlcpy exists... ";
 # Perform the strlcpy() test..
 $config{HAS_STRLCPY} = "false";
 my $fail = 0;
 open(STRLCPY, "</usr/include/string.h") or $fail = 1;
-if (!$fail)
-{
-       while (chomp($line = <STRLCPY>))
-       {
+if (!$fail) {
+       while (chomp($line = <STRLCPY>)) {
                # try and find the delcaration of:
                # size_t strlcpy(...)
-               if ($line =~ /size_t(\0x9|\s)+strlcpy/)
-               {
+               if ($line =~ /size_t(\0x9|\s)+strlcpy/) {
                        $config{HAS_STRLCPY} = "true";
                }
        }
@@ -116,18 +188,37 @@ if (!$fail)
 print "yes\n" if $config{HAS_STRLCPY} eq "true";
 print "no\n" if $config{HAS_STRLCPY} eq "false";
 
+printf "Checking if execinfo.h exists... ";
+$config{HAS_EXECINFO} = "0";
+my $fail = 0;
+open(EXECINFO, "</usr/include/execinfo.h") or $fail = 1;
+if ($fail) {
+       $fail = 0;
+       open(EXECINFO, "</usr/local/include/execinfo.h") or $fail = 1;
+       if (!$fail) {
+               printf "/usr/local/include/execinfo.h\n";
+               $config{HAS_EXECINFO} = "1";
+               close(EXECINFO);
+       }
+       else {
+               printf "Not found!\n";
+       }
+}
+else {
+       printf "/usr/include/execinfo.h\n";
+       $config{HAS_EXECINFO} = "1";
+       close(EXECINFO);
+}
+
 printf "Checking if kqueue exists... ";
 $has_kqueue = 0;
 $fail = 0;
 open(KQUEUE, "</usr/include/sys/event.h") or $fail = 1;
-if (!$fail)
-{
-        while (chomp($line = <KQUEUE>))
-        {
+if (!$fail) {
+        while (chomp($line = <KQUEUE>)) {
                 # try and find the delcaration of:
                # int kqueue(void);
-               if ($line =~ /int(\0x9|\s)+kqueue/)
-               {
+               if ($line =~ /int(\0x9|\s)+kqueue/) {
                        $has_kqueue = 1;
                }
        }
@@ -140,17 +231,8 @@ printf "Checking if epoll exists... ";
 $has_epoll = 0;
 $fail = 0;
 open(EPOLL, "</usr/include/sys/epoll.h") or $fail = 1;
-if (!$fail)
-{
-       while (chomp($line = <EPOLL>))
-       {
-               # try and find the declaration of:
-               # extern int epoll_create (int __size) __THROW;
-               if (($line =~ /int(\0x9|\s)+epoll_create(\0x9|\s)+\(/) || ($line =~ /int(\0x9|\s)+epoll_create\(/))
-               {
-                       $has_epoll = 1;
-               }
-       }
+if (!$fail) {
+       $has_epoll = 1;
        close(EPOLL);
 }
 if ($has_epoll) {
@@ -163,13 +245,31 @@ if ($has_epoll) {
 print "yes\n" if $has_epoll == 1;
 print "no\n" if $has_epoll == 0;
 
-if ($config{OSNAME} =~ /CYGWIN/) {
+if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
        $config{HAS_STRLCPY} = "true";
 }
 
 $config{HAS_EPOLL} = $has_epoll;
 $config{HAS_KQUEUE} = $has_kqueue; 
 
+printf "Checking for libgnutls... ";
+if (($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS} >= 1.2) || ($config{HAS_GNUTLS} eq "y"))) {
+       print "yes\n";
+       $config{HAS_GNUTLS} = "y";
+} else {
+       print "no\n";
+       $config{HAS_GNUTLS} = "n";
+}
+
+printf "Checking for openssl... ";
+if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPENSSL} eq "y"))) {
+       print "yes\n";
+       $config{HAS_OPENSSL} = "y";
+} else {
+       print "no\n";
+       $config{HAS_OPENSSL} = "n";
+}
+
 ################################################################################
 #                          BEGIN INTERACTIVE PART                              #
 ################################################################################
@@ -180,6 +280,7 @@ system("clear");
 show_splash();
 chomp($wholeos = `uname -mnr`);
 
+my $rev = getrevision();
 # Display Introduction Message..
 print "
 Welcome to the InspIRCd Configuration program!
@@ -194,33 +295,39 @@ Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter
 a new value. Please note: You will \033[1mHAVE\033[0m to read the docs
 dir, otherwise you won't have a config file!
 
-Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos), fdmax: $config{MAX_CLIENT_T}\n\n";
+Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos), fdmax: $config{MAX_CLIENT_T}
+Your InspIRCd revision ID is \033[1;32mr$rev\033[0m";
+if ($rev eq "r0") {
+       print " (Non-SVN build)";
+}
+print ".\n\n";
 
 $config{CHANGE_COMPILER} = "n";
-print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.$config{GCC34}\033[0m)\n";
+print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
 
-if ($config{GCCVER} < 3)
-{
+while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) {
        print "\033[1;32mIMPORTANT!\033[0m A GCC 2.x compiler has been detected, and
-should NOT be used. You should probably specify a newer compiler.\n";
-}
-yesno(CHANGE_COMPILER,"Do you want to change the compiler?");
-if ($config{CHANGE_COMPILER} =~ /y/i)
-{
-    print "What command do you want to use to invoke your compiler?\n";
-    print "[\033[1;32m$config{CC}\033[0m] -> ";
-    chomp($config{CC} = <STDIN>);
-    if ($config{CC} eq "") { $config{CC} = "g++"; }
-    chomp($foo = `$config{CC} -dumpversion | cut -c 1`);
-    if ($foo ne "") {
-            chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change
-            chomp($config{GCC34}        = `$config{CC} -dumpversion | cut -c 3`); # the compiler path
-           print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.$config{GCC34}\033[0m)\n";
-    }
-    else
-    {
-           print "\033[1;32mWARNING!\033[0m Could not execute the compiler you specified. You may want to try again.\n";
-    }
+should NOT be used. You should probably specify a newer compiler.\n\n";
+       yesno(CHANGE_COMPILER,"Do you want to change the compiler?");
+       if ($config{CHANGE_COMPILER} =~ /y/i) {
+               print "What command do you want to use to invoke your compiler?\n";
+               print "[\033[1;32m$config{CC}\033[0m] -> ";
+               chomp($config{CC} = <STDIN>);
+               if ($config{CC} eq "") {
+                       $config{CC} = "g++";
+               }
+               chomp($foo = `$config{CC} -dumpversion | cut -c 1`);
+               if ($foo ne "") {
+                       chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers
+                       print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
+                       if ($config{GCCVER} < 3) {
+                               print "\033[1;32mGCC 2.x WILL NOT WORK!\033[0m. Let's try that again, shall we?\n";
+                       }
+               }
+               else {
+                       print "\033[1;32mWARNING!\033[0m Could not execute the compiler you specified. You may want to try again.\n";
+               }
+       }
 }
 
 print "\n";
@@ -249,15 +356,41 @@ if ($has_epoll) {
        print "\n";
 }
 $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y"));
-if (!$chose_hiperf)
-{
+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";
 }
 
-yesno(THREADED_DNS,"Would you like to enable the experimental multi-threaded DNS lookup?");
+yesno(IPV6,"Would you like to build InspIRCd with IPv6 support?");
 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";
+       $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.");
+       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 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";
+}
+
+if ($config{HAS_GNUTLS} eq "y") {
+       yesno(USE_GNUTLS, "Would you like to enable SSL Support?");
+       if ($config{USE_GNUTLS} eq "y") {
+               print "\nUsing GnuTLS SSL module.\n";
+       }
+} elsif ($config{HAS_OPENSSL} eq "y") {
+       yesno(USE_OPENSSL, "Would you like to enable SSL Support?");
+       if ($config{USE_OPENSSL} eq "y") {
+               print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\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";
 print "as defaults unless you have a real reason to change them. If they\n";
@@ -269,206 +402,230 @@ 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
+       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";
+                       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";
-  }
+       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";
-  }
+       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";
-  }
+       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";
- }
+       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";
-  }
+       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";
-  }
+       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";
-  }
+       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";
-  }
+       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";
-  }
+       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";
-  }
+       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";
-  }
+       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
@@ -485,64 +642,137 @@ 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};
+       $var = $config{OPTIMITEMP};
 }
 
 if ($var eq "1") {
-  $config{OPTIMITEMP} = 1;
-  $config{OPTIMISATI} = "-O";
+       $config{OPTIMITEMP} = 1;
+       $config{OPTIMISATI} = "-O";
 } elsif ($var eq "2") {
-  $config{OPTIMITEMP} = 2;
-  $config{OPTIMISATI} = "-O2";
+       $config{OPTIMITEMP} = 2;
+       $config{OPTIMISATI} = "-O2";
 } elsif ($var eq "3") {
-  $config{OPTIMITEMP} = 3;
-  $config{OPTIMISATI} = "-O3";
+       $config{OPTIMITEMP} = 3;
+       $config{OPTIMISATI} = "-O3";
 } else {
-  $config{OPTIMITEMP} = 0;
-  $config{OPTIMISATI} = "-g";
+       $config{OPTIMITEMP} = 0;
+       $config{OPTIMISATI} = "-g";
 }
 
 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}\n";
-print "\033[0mConfig path:\033[1;32m\t\t\t$config{CONFIG_DIR}\n";
-print "\033[0mModule path:\033[1;32m\t\t\t$config{MODULE_DIR}\n";
-print "\033[0mLibrary path:\033[1;32m\t\t\t$config{LIBRARY_DIR}\n";
-print "\033[0mMax connections:\033[1;32m\t\t$config{MAX_CLIENT}\n";
-print "\033[0mMax User Channels:\033[1;32m\t\t$config{MAX_CHANNE}\n";
-print "\033[0mMax Oper Channels:\033[1;32m\t\t$config{MAX_OPERCH}\n";
-print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\n";
-print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\n";
-print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\n";
-print "\033[0mMax ident length:\033[1;32m\t\t$config{MAX_IDENT}\n";
-print "\033[0mMax quit length:\033[1;32m\t\t$config{MAX_QUIT}\n";
-print "\033[0mMax topic length:\033[1;32m\t\t$config{MAX_TOPIC}\n";
-print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\n";
-print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\n";
-print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\n";
-print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.$config{GCC34}\n";
-print "\033[0mOptimatizaton Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\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[0mMultithread DNS:\033[1;32m\t\t$config{THREADED_DNS}\033[0m\n\n";
+print "\033[0mMultithread DNS:\033[1;32m\t\t$config{THREADED_DNS}\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";
+
+if ($config{USE_GNUTLS} eq "y") {
+       $failed = 0;
+       open(TMP, "<src/modules/m_ssl_gnutls.cpp") or $failed = 1;
+       close(TMP);
+       if ($failed) {
+               print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
+               chdir("src/modules");
+               system("ln -s extra/m_ssl_gnutls.cpp");
+               chdir("../..");
+       }
+       getmodules();
+       $failed = 0;
+       open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
+       close(TMP);
+       open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
+       close(TMP);
+       if ($failed) {
+               print "SSL Certificates Not found, Generating.. \n\n
+*************************************************************
+* Generating the Private Key may take some time, go grab a  *
+* Coffee. Even better, to generate some more entropy if it  *
+* is taking a while, open another console and type du / a   *
+* few times and get that HD going :) Then answer the        *
+* 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");
+               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");
+               print "Done.\n\n";
+       } else {
+               print "SSL Certificates found, skipping.\n\n"
+       }       
+} elsif ($config{USE_OPENSSL} eq "y") {
+       $failed = 0;
+       open(TMP, "<src/modules/m_ssl_openssl.cpp") or $failed = 1;
+       close(TMP);
+       if ($failed) {
+               print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
+               chdir("src/modules");
+               system("ln -s extra/m_ssl_openssl.cpp");
+               chdir("../..");
+       }
+       getmodules();
+       $failed = 0;
+       open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
+       close(TMP);
+       open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
+       close(TMP);
+       if ($failed) {
+               print "SSL Certificates Not found, Generating.. \n\n
+*************************************************************
+* 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");
+               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");
+               system("mv dhparams.pem $config{CONFIG_DIR}/dhparams.pem");
+               print "Done.\n\n";
+       } else {
+               print "SSL Certificates found, skipping.\n\n"
+       }
+}
+if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
+       print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
+}
 
+getosflags();
 makecache();
-writefiles();
+writefiles(1);
 
 print "\n\n";
 print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
+if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
+       print "Please remember that to enable \033[1;32mSSL support\033[0m you must\n";
+       print "load the required modules in your config. This configure process\n";
+       print "has just prepared these modules to be compiled for you, and has not\n";
+       print "configured them to be compiled into the core of the ircd.\n";
+}
 print "*** \033[1;32mRemember to edit your configuration files!!!\033[0m ***\n\n\n";
 if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) {
        print "\033[1;32mWARNING!\033[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but i'm letting you\ngo ahead with it anyway, just in case i'm wrong :-)\n";
 }
-if ($config{OSNAME} =~ /CYGWIN/) {
-       print <<FOO;
-\033[1;32mWARNING!\033[0m CYGWIN does not properly support shared modules,
-so modules will be compiled statically into the core of the ircd. The modules
-will act like they are being loaded from disk and being unloaded from RAM,
-however they are in fact being enabled and disabled similar to features in
-other ircds.
-FOO
-}
 
 if ($config{GCCVER} < "3") {
        print <<FOO2;
@@ -558,159 +788,188 @@ FOO2
 #                              HELPER FUNCTIONS                                #
 ################################################################################
 sub getcache {
-  # Retrieves the .config.cache file, and loads values into the main config hash.
-  open(CACHE, ".config.cache") or return undef;
-  while (<CACHE>) {
-    chomp;
-
-    # Ignore Blank lines, and comments..
-    next if /^\s*$/;
-    next if /^\s*#/;
-
-    my ($key, $value) = split("=", $_);
-    $value =~ /^\"(.*)\"$/;
-    # Do something with data here!
-    $config{$key} = $1;
-  }
-  close(CONFIG);
-  return "true";
+       # Retrieves the .config.cache file, and loads values into the main config hash.
+       open(CACHE, ".config.cache") or return undef;
+       while (<CACHE>) {
+               chomp;
+               # Ignore Blank lines, and comments..
+               next if /^\s*$/;
+               next if /^\s*#/;
+               my ($key, $value) = split("=", $_);
+               $value =~ /^\"(.*)\"$/;
+               # Do something with data here!
+               $config{$key} = $1;
+       }
+       close(CONFIG);
+       return "true";
 }
 
 sub makecache {
-  # Dump the contents of %config
-  print "Writing \033[1;32mcache file\033[0m for future ./configures ...\n";
-  open(FILEHANDLE, ">.config.cache");
-  foreach $key (keys %config)
-  {
-    print FILEHANDLE "$key=\"$config{$key}\"\n";
-  }
-  close(FILEHANDLE);
+       # Dump the contents of %config
+       print "Writing \033[1;32mcache file\033[0m for future ./configures ...\n";
+       open(FILEHANDLE, ">.config.cache");
+       foreach $key (keys %config) {
+               print FILEHANDLE "$key=\"$config{$key}\"\n";
+       }
+       close(FILEHANDLE);
 }
 
 sub dir_check {
-  my ($desc, $hash_key) = @_;
-  my $complete = 0;
-  while (!$complete) {
-    print "In what directory $desc?\n";
-    print "[\033[1;32m$config{$hash_key}\033[0m] -> ";
-    chomp($var = <STDIN>);
-    if ($var eq "") { $var = $config{$hash_key}; }
-    if ($var =~ /^\~\/(.+)$/) {
-       # Convert it to a full path..
-       $var = resolve_directory($ENV{HOME} . "/" . $1);
-    }
-    if (substr($var,0,1) ne "/")
-    {
-        # Assume relative Path was given.. fill in the rest.
-        $var = $this . "/$var";
-    }
-    $var = resolve_directory($var); 
-    if (! -e $var) {
-      print "$var does not exist. Create it?\n[\033[1;32my\033[0m] ";
-      chomp($tmp = <STDIN>);
-      if (($tmp eq "") || ($tmp =~ /^y/i)) {
-        # Attempt to Create the Dir..
-        $chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
-        if ($chk != 0) {
-          print "Unable to create directory. ($var)\n\n";
-          # Restart Loop..
-          next;
-        }
-      } else {
-        # They said they don't want to create, and we can't install there.
-        print "\n\n";
-        next;
-      }
-    } else {
-      if (!is_dir($var)) {
-        # Target exists, but is not a directory.
-        print "File $var exists, but is not a directory.\n\n";
-        next;
-      }
-    }
-    # Either Dir Exists, or was created fine.
-    $config{$hash_key} = $var;
-    $complete = 1;
-    print "\n";
-  }
+       my ($desc, $hash_key) = @_;
+       my $complete = 0;
+       while (!$complete) {
+               print "In what directory $desc?\n";
+               print "[\033[1;32m$config{$hash_key}\033[0m] -> ";
+               chomp($var = <STDIN>);
+               if ($var eq "") {
+                       $var = $config{$hash_key};
+               }
+               if ($var =~ /^\~\/(.+)$/) {
+                       # Convert it to a full path..
+                       $var = resolve_directory($ENV{HOME} . "/" . $1);
+               }
+               if (substr($var,0,1) ne "/")
+               {
+                       # Assume relative Path was given.. fill in the rest.
+                       $var = $this . "/$var";
+               }
+               $var = resolve_directory($var); 
+               if (! -e $var) {
+                       print "$var does not exist. Create it?\n[\033[1;32my\033[0m] ";
+                       chomp($tmp = <STDIN>);
+                       if (($tmp eq "") || ($tmp =~ /^y/i)) {
+                               # Attempt to Create the Dir..
+                               $chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
+                               if ($chk != 0) {
+                                       print "Unable to create directory. ($var)\n\n";
+                                       # Restart Loop..
+                                       next;
+                               }
+                       } else {
+                               # They said they don't want to create, and we can't install there.
+                               print "\n\n";
+                               next;
+                       }
+               } else {
+                       if (!is_dir($var)) {
+                               # Target exists, but is not a directory.
+                               print "File $var exists, but is not a directory.\n\n";
+                               next;
+                       }
+               }
+               # Either Dir Exists, or was created fine.
+               $config{$hash_key} = $var;
+               $complete = 1;
+               print "\n";
+       }
 }
 
 sub getosflags {
-  if ($config{OSNAME} =~ /BSD$/) {
-    $config{LDLIBS} = "-Ldl -lstdc++";
-    $config{FLAGS}  = "-fPIC -frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
-    $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
-               chomp($config{GCC34}        = `eg++ -dumpversion | cut -c 3`); # the compiler path
-       }
-    }
-  } else {
-    $config{LDLIBS} = "-ldl -lstdc++";
-    $config{FLAGS}  = "-fPIC -frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
-    $config{MAKEPROG} = "make";
-    if ($config{OSNAME} =~ /CYGWIN/) {
-       $config{FLAGS}  = "-frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
-       $config{LDLIBS} = "";
-       $config{MAKEPROG} = "/usr/bin/make";
-       $config{MAKEORDER} = "mods ircd config bininst";
-       $config{STATICLIBS} = "modules/mods.a";
-       $config{STATIC_LINK} = "yes";
-    }
-  }
-  if ($config{OSNAME} =~ /SunOS/) {
-    # 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{LDLIBS} = $config{LDLIBS} . " -lsocket -lnsl -lrt -lresolv";
-  }
+       if ($config{OSNAME} =~ /BSD$/) {
+               $config{LDLIBS} = "-Ldl -lstdc++";
+               $config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $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
+                       }
+               }
+       } else {
+               $config{LDLIBS} = "-ldl -lstdc++";
+               $config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $config{MAKEPROG} = "make";
+               if ($config{OSNAME} =~ /CYGWIN/) {
+                       $config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+                       $config{LDLIBS} = "";
+                       $config{MAKEPROG} = "/usr/bin/make";
+                       $config{MAKEORDER} = "ircd mods";
+               } elsif ($config{OSNAME} eq "CYG-STATIC") {
+                       $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+                       $config{LDLIBS} = "";
+                       $config{MAKEPROG} = "/usr/bin/make";
+                       $config{MAKEORDER} = "mods ircd";
+                       $config{STATICLIBS} = "modules/mods.a";
+                       $config{STATIC_LINK} = "yes";
+               }
+       }
+       if ($config{OSNAME} =~ /SunOS/) {
+               # 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{LDLIBS} = $config{LDLIBS} . " -lsocket -lnsl -lrt -lresolv";
+       }
 }
 
 sub is_dir {
-  my ($path) = @_;
-  if (chdir($path)) {
-    chdir($this);
-    return 1;
-  } else {
-    # Just in case..
-    chdir($this);
-    return 0;
-  }
+       my ($path) = @_;
+       if (chdir($path)) {
+               chdir($this);
+               return 1;
+       } else {
+               # Just in case..
+               chdir($this);
+               return 0;
+       }
 }
 
 sub getmodules {
-  my $i = 0;
-  opendir(DIRHANDLE, "src/modules");
-  foreach $name (sort readdir(DIRHANDLE)) {
-    if ($name =~ /^m_(.+)\.cpp$/)
-    {
-      $mod = $1;
-      if ($mod !~ /_static$/) {
-             $modlist[$i++] = $mod;
-      }
-    }
-  }
-  closedir(DIRHANDLE);
+       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 writefiles {
+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;
+}
 
-  print "Writing \033[1;32minspircd_config.h\033[0m\n";
-  # First File.. inspircd_config.h
-  chomp(my $incos = `uname -n -s -r`);
-  chomp(my $version = `sh ./src/version.sh`);
-  open(FILEHANDLE, ">include/inspircd_config.h");
-  my $NL = $config{NICK_LENGT}+1;
-  my $CL = $config{CHAN_LENGT}+1;
-  print FILEHANDLE <<EOF;
+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(my $revision2 = getrevision());
+       if ($writeheader == 1)
+       {
+               print "Writing \033[1;32minspircd_config.h\033[0m\n";
+               open(FILEHANDLE, ">include/inspircd_config.h");
+               my $NL = $config{NICK_LENGT}+1;
+               my $CL = $config{CHAN_LENGT}+1;
+               print FILEHANDLE <<EOF;
 /* Auto generated by configure, do not modify! */
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
@@ -718,7 +977,9 @@ sub writefiles {
 #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 MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
 #define CHANMAX $CL
 #define MAXCHANS $config{MAX_CHANNE}
@@ -734,217 +995,178 @@ sub writefiles {
 #define SYSTEM "$incos"
 #define MAXBUF 514
 EOF
+               if ($config{OSNAME} =~ /SunOS/) {
+                       print FILEHANDLE "#define IS_SOLARIS\n";
+               }
+               if ($config{OSNAME} =~ /CYGWIN/) {
+                       print FILEHANDLE "#define IS_CYGWIN\n";
+                       print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE        1024\n#endif\n";
+               }
+               if ($config{OSNAME} eq "CYG-STATIC") {
+                       print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
+               }
+               if ($config{HAS_EXECINFO} eq "1") {
+                       print FILEHANDLE "#define HAS_EXECINFO\n";
+               }
+               if ($config{STATIC_LINK} eq "yes") {
+                       print FILEHANDLE "#define STATIC_LINK\n";
+               }
+               if ($config{GCCVER} >= 3) {
+                       print FILEHANDLE "#define GCC3\n";
+               }
+               if ($config{HAS_STRLCPY} eq "true") {
+                       print FILEHANDLE "#define HAS_STRLCPY\n";
+               }
+               if ($config{HAS_STDINT} eq "true") {
+                       print FILEHANDLE "#define HAS_STDINT\n";
+               }
+               if ($config{THREADED_DNS} =~ /y/i) {
+                       print FILEHANDLE "#define THREADED_DNS\n";
+               }
+               if ($config{IPV6} =~ /y/i) {
+                       print FILEHANDLE "#define IPV6\n";
+               }
+               if ($config{SUPPORT_IP6LINKS} =~ /y/i) {
+                       print FILEHANDLE "#define SUPPORT_IP6LINKS\n";
+               }
+               my $use_hiperf = 0;
+               if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+                       print FILEHANDLE "#define USE_KQUEUE\n";
+                       $se = "socketengine_kqueue";
+                       $use_hiperf = 1;
+               }
+               if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+                       print FILEHANDLE "#define USE_EPOLL\n";
+                       $se = "socketengine_epoll";
+                       $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) {
+                       print FILEHANDLE "#define USE_SELECT\n";
+                       $se = "socketengine_select";
+               }
+               print FILEHANDLE "\n#endif\n";
+               close(FILEHANDLE);
+       }
 
-  if ($config{OSNAME} =~ /SunOS/) {
-    print FILEHANDLE "#define IS_SOLARIS\n";
-  }
-  if ($config{OSNAME} =~ /CYGWIN/) {
-    print FILEHANDLE "#define IS_CYGWIN\n";
-    print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE   1024\n#endif\n";
-  }
-  if ($config{STATIC_LINK} eq "yes") {
-    print FILEHANDLE "#define STATIC_LINK\n";
-  }
-  if ($config{GCCVER} > 3) {
-    print FILEHANDLE "#define GCC3\n";
-    print FILEHANDLE "#define GCC34\n";
-  }
-  else
-  {
-    if ($config{GCCVER} == 3) {
-      print FILEHANDLE "#define GCC3\n";
-      if ($config{GCC34} > 3) {
-        print FILEHANDLE "#define GCC34\n";
-      }
-    }
-  }
-  if ($config{HAS_STRLCPY} eq "true") {
-    print FILEHANDLE "#define HAS_STRLCPY\n";
-  }
-  if ($config{THREADED_DNS} =~ /y/i) {
-    print FILEHANDLE "#define THREADED_DNS\n";
-  }
-  my $use_hiperf = 0;
-  if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-    print FILEHANDLE "#define USE_KQUEUE\n";
-    $use_hiperf = 1;
-  }
-  if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-    print FILEHANDLE "#define USE_EPOLL\n";
-    $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) {
-    print FILEHANDLE "#define USE_SELECT\n";
-  }
-  print FILEHANDLE "\n#endif\n";
-  close(FILEHANDLE);
-
-  # Create a Modules List..
-  my $modules = "";
-  foreach $i (@modlist)
-  {
-    if ($config{OSNAME} =~ /CYGWIN/) {
-        $modules .= "m_".$i.".o ";
-    }
-    else {
-        $modules .= "m_".$i.".so ";
-    }
-  }
-  chomp($modules);   # Remove Redundant whitespace..
-
-
-  # Write all .in files.
-  my $tmp = "";
-  my $file = "";
-  my $exe = "inspircd";
-
-  if ($config{OSNAME} =~ /CYGWIN/) {
-    $exe = "inspircd.exe";
-  }
-
-  opendir(DIRHANDLE, $this);
-  if ($config{THREADED_DNS} =~ /y/i) {
-    $config{LDLIBS} = $config{LDLIBS} . " -pthread";
-  }
-  foreach $name (sort readdir(DIRHANDLE)) {
-    if ($name =~ /^\.(.+)\.inc$/)
-    {
-      $file = $1;
-      # All .name.inc files need parsing!
-      $tmp = "";
-      open(FILEHANDLE, ".$file.inc");
-      while (<FILEHANDLE>) {
-        $tmp .= $_;
-      }
-      close(FILEHANDLE);
-
-      $tmp =~ s/\@CC\@/$config{CC}/;
-      $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
-      $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
-      $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/\@MODULES\@/$modules/;
-      $tmp =~ s/\@EXECUTABLE\@/$exe/;
-      $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
-      $tmp =~ s/\@STATICLIBS\@/$config{STATICLIBS}/;
-
-      print "Writing \033[1;32m$file\033[0m\n";
-      open(FILEHANDLE, ">$file");
-      print FILEHANDLE $tmp;
-    }
-  }
-  closedir(DIRHANDLE);
-
-  # Make inspircd executable!
-  chmod 0744, 'inspircd';
-
-  if ($config{OSNAME} =~ /CYGWIN/) {
-       print "Writing static-build \033[1;32msrc/Makefile\033[0m\n";
-       write_static_makefile();
-  }
-  else {
-       print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
-       write_dynamic_makefile();
-  }
-
-
-  # Modules Makefile..
-  print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
-  open(FILEHANDLE, ">src/modules/Makefile");
-  print FILEHANDLE <<EOF;
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Many Thanks to Andrew Church <achurch\@achurch.org>
-#    for assisting with making this work right.
-#
-# Automatically Generated by ./configure to add a modules
-# please run ./configure --update
+       if ($writeheader)
+       {
+               open(FILEHANDLE, ">include/inspircd_se_config.h");
+               print FILEHANDLE <<EOF;
+/* Auto generated by configure, do not modify or commit to svn! */
+#ifndef __CONFIGURATION_SOCKETENGINE__
+#define __CONFIGURATION_SOCKETENGINE__
 
-all: \$(MODULES)
+#include "$se.h"
 
+#endif
 EOF
+               close(FILEHANDLE);
+       }
 
-  # Create a Modules List..
-  my $modules = "";
-  my $flags = "";
-  if ($config{OSNAME} =~ /CYGWIN/) {
-     open(MODLIST,">include/modlist.h");
-     print MODLIST <<HEADER;
-// Generated automatically by configure. DO NOT EDIT!
 
-#ifndef __SYMBOLS__H_CONFIGURED__
-#define __SYMBOLS__H_CONFIGURED__
+       # Create a Modules List..
+       my $modules = "";
+       foreach $i (@modlist)
+       {
+               if ($config{STATIC_LINK} eq "yes") {
+                       $modules .= "m_".$i.".o ";
+               }
+               else {
+                       $modules .= "m_".$i.".so ";
+               }
+       }
+       chomp($modules);   # Remove Redundant whitespace..
 
-HEADER
-     foreach $i (@modlist) {
-       if ($i !~ /_static$/) {
-               print MODLIST "extern \"C\" void * $i\_init (void);\n";
-       }
-     }
-     print MODLIST "\nstruct {const char *name; initfunc *value; } modsyms[] = {\n";
-  }
-  foreach $i (@modlist)
-  {
-    if ($i !~ /_static$/) {
-     $flags = getcompilerflags("src/modules/m_".$i.".cpp");
-     if ($config{OSNAME} =~ /CYGWIN/) {
-        print FILEHANDLE <<EOCHEESE;
-m_$i.o: m_$i\_static.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h
-       \$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c m_$i\_static.cpp
-       mv m_$i\_static.o ../m_$i.o
 
-EOCHEESE
-        print "Configuring module [\033[1;32mm_$i.so\033[0m] for static linking... ";
-        open(MODULE,"<src/modules/m_".$i.".cpp") or die("Could not open m_".$i.".cpp");
-        open(MUNGED,">src/modules/m_".$i."_static.cpp") or die("Could not create m_".$i."_static.cpp");
-        while (chomp($a = <MODULE>)) { 
-               $a =~ s/init_module/$i\_init/g;
-               $a =~ s/Srv/$i\Srv/g;
-               print MUNGED "$a\n";
-        }
-        close(MODULE);
-        close(MUNGED);
-        print MODLIST <<EOENT;
-{"m_$i.so",\&$i\_init},
-EOENT
-        print "done\n";
-     }
-     else {
-         print FILEHANDLE <<EOCHEESE;
-m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h
-       \$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c m_$i.cpp
-       \$(CC) \$(FLAGS) -shared $flags -o m_$i.so m_$i.o
-       \@-rm -f \$(MODPATH)/m_$i.so
-       cp m_$i.so \$(MODPATH)/
-       chmod 0700 \$(MODPATH)/m_$i.so
+       # Write all .in files.
+       my $tmp = "";
+       my $file = "";
+       my $exe = "inspircd";
 
-EOCHEESE
-      }
-   }
-  }
-  if ($config{OSNAME} =~ /CYGWIN/) {
-     print MODLIST "{0}};\n\n#endif\n";
-     close(MODLIST);
-  }
+       if ($config{OSNAME} =~ /CYGWIN/) {
+               $exe = "inspircd.exe";
+       }
+
+       opendir(DIRHANDLE, $this);
+       if ($config{THREADED_DNS} =~ /y/i) {
+               $config{LDLIBS} = $config{LDLIBS} . " -pthread";
+       }
+       foreach $name (sort readdir(DIRHANDLE)) {
+               if ($name =~ /^\.(.+)\.inc$/) {
+                       $file = $1;
+                       # All .name.inc files need parsing!
+                       $tmp = "";
+                       open(FILEHANDLE, ".$file.inc");
+                       while (<FILEHANDLE>) {
+                               $tmp .= $_;
+                       }
+                       close(FILEHANDLE);
+
+                       $tmp =~ s/\@CC\@/$config{CC}/;
+                       $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
+                       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
+                       $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/\@MODULES\@/$modules/;
+                       $tmp =~ s/\@EXECUTABLE\@/$exe/;
+                       $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
+                       $tmp =~ s/\@STATICLIBS\@/$config{STATICLIBS}/;
+
+                       print "Writing \033[1;32m$file\033[0m\n";
+                       open(FILEHANDLE, ">$file");
+                       print FILEHANDLE $tmp;
+               }
+       }
+       closedir(DIRHANDLE);
+
+       # Make inspircd executable!
+       chmod 0744, 'inspircd';
+
+       if ($config{STATIC_LINK} eq "yes") {
+               print "Writing static-build \033[1;32msrc/Makefile\033[0m\n";
+               write_static_makefile();
+               write_static_modules_makefile();
+       } elsif ($config{OSNAME} =~ /CYGWIN/) {
+               print "Writing cygwin-build \033[1;32msrc/Makefile\033[0m\n";
+               write_static_makefile();
+               write_dynamic_modules_makefile();
+       } else {
+               print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
+               write_dynamic_makefile();
+               write_dynamic_modules_makefile();
+       }
 }
 
 sub getcompilerflags {
-  my ($file) = @_;
-  open(FLAGS, $file);
-  while (<FLAGS>) {
-    if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
-      close(FLAGS);
-      return $1;
-    }
-  }
-  close(FLAGS);
-  return undef;
+       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 show_splash {
@@ -977,48 +1199,252 @@ sub yesno {
        return;
 }
 
+sub write_static_modules_makefile {
+       # Modules Makefile..
+       print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
+       open(FILEHANDLE, ">src/modules/Makefile");
+
+       ###
+       # Module Makefile Header
+       ###
+       print FILEHANDLE <<EOF;
+# (C) ChatSpike development team
+# Makefile by <Craig\@ChatSpike.net>
+# Many Thanks to Andrew Church <achurch\@achurch.org>
+#    for assisting with making this work right.
+#
+# Automatically Generated by ./configure to add a modules
+# please run ./configure --update
+
+all: \$(MODULES)
+
+EOF
+       ###
+       # End Module Makefile Header
+       ###
+
+       # Create a Modules List..
+       my $modules = "";
+       my $cmflags = "";
+       my $liflags = "";
+
+       open(MODLIST,">include/modlist.h");
+
+       ###
+       # Include File Header
+       ###
+       print MODLIST <<HEADER;
+// Generated automatically by configure. DO NOT EDIT!
+
+#ifndef __SYMBOLS__H_CONFIGURED__
+#define __SYMBOLS__H_CONFIGURED__
+
+HEADER
+       ###
+       # End Include File Header
+       ###
+
+       # Place Module List into Include
+       foreach $i (@modlist) {
+               if ($i !~ /_static$/) {
+                       print MODLIST "extern \"C\" void * $i\_init (void);\n";
+               }
+       }
+       print MODLIST "\nstruct {const char *name; initfunc *value; } modsyms[] = {\n";
+
+       ###
+       # Build Module Crap
+       ###
+       foreach $i (@modlist)
+       {
+               if ($i !~ /_static$/) {
+                       $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
+                       $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
+
+                       ###
+                       # 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
+       \$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c .m_$i\_static.cpp
+       mv .m_$i\_static.o ../m_$i.o
+
+EOCHEESE
+                       ###
+                       # End Write Entry to the MakeFile
+                       ###
+                       print "Configuring module [\033[1;32mm_$i.so\033[0m] for static linking... ";
+                       open(MODULE,"<src/modules/m_".$i.".cpp") or die("Could not open m_".$i.".cpp");
+                       open(MUNGED,">src/modules/.m_".$i."_static.cpp") or die("Could not create .m_".$i."_static.cpp");
+                       while (chomp($a = <MODULE>)) { 
+                               $a =~ s/init_module/$i\_init/g;
+                               print MUNGED "$a\n";
+                       }
+                       close(MODULE);
+                       close(MUNGED);
+                       print MODLIST <<EOENT;
+{"m_$i.so",\&$i\_init},
+EOENT
+                       print "done\n";
+               }
+       }
+       print MODLIST "{0}};\n\n#endif\n";
+       close(MODLIST);
+}
+
+sub write_dynamic_modules_makefile {
+       # Modules Makefile..
+       print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
+       open(FILEHANDLE, ">src/modules/Makefile");
+       my $extra = "";
+
+       if ($config{OSNAME} =~ /CYGWIN/) {
+               $extra = "../inspircd.dll.a";
+       }
+
+###
+# Module Makefile Header
+###
+       print FILEHANDLE <<EOF;
+# (C) ChatSpike development team
+# Makefile by <Craig\@ChatSpike.net>
+# Many Thanks to Andrew Church <achurch\@achurch.org>
+#    for assisting with making this work right.
+#
+# Automatically Generated by ./configure to add a modules
+# please run ./configure -update or ./configure -modupdate
+
+all: \$(MODULES)
+
+EOF
+       ###
+       # End Module Makefile Header
+       ###
+
+       # Create a Modules List..
+       my $modules = "";
+       my $cmflags = "";
+       my $liflags = "";
+       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
+       \$(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
+       $crud = $crud . "       \@install -v -m 0700 m_$i.so \$(MODPATH)\n";
+       ###
+       # End Write Entry to the MakeFile
+       ###
+       }
+       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 $srcobjs = "";
+        foreach my $cmd (@cmdlist) {
+                $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
+                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
+       }
        print FH <<EOM;
 # Insp Makefile :p
 #
 # (C) ChatSpike development team
 # Makefile by <Craig\@ChatSpike.net>
-# Makefile version 2 (dynamically linked core) by <brain\@inspircd.org>
+# Makefile version 2 (statically linked core) by <brain\@inspircd.org>
 #
 
 CC = im a cheezeball
 
 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)
+
+EOM
+
+$se = "socketengine_select";
+if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+       $se = "socketengine_kqueue";
+}       
+elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+       $se = "socketengine_epoll";
+}
 
-all: 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 inspircd_io.o message.o commands.o dnsqueue.o dynamic.o users.o modules.o wildcard.o helperfuncs.o \$(MODULES) inspircd.exe
+       ###
+       # This next section is for cygwin dynamic module builds.
+       # Basically, what we do, is build the inspircd core as a library
+       # then the main executable uses that. the library is capable of
+       # loading / unloading the modules dynamically :)
+       # Massive thanks to the guys on #cygwin @ irc.freenode.net for helping
+       # make this work :)
+       ###
+
+       if ($config{OSNAME} =~ /CYGWIN/) {
+               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 message.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 message.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
+       \$(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 message.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 inspircd_io.o message.o commands.o dnsqueue.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 \$(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 message.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)
+EOM
+       }
+
+       print FH <<EOM;
 
 cull_list.o: 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
 
+snomasks.o: 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
+
 command_parse.o: 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
 
 userprocess.o: 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
 
-socketengine.o: socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
+socketengine.o: $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
 
 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../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+       \$(CC) -pipe -I/usr/local/include -L/usr/local/lib -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
+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)
+       \${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
        \$(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
@@ -1033,17 +1459,14 @@ dns.o: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../inclu
 base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
 
-inspircd_io.o: inspircd_io.cpp ../include/base.h ../include/inspircd_io.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 inspircd_io.cpp
+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
 
 message.o: message.cpp ../include/base.h ../include/message.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 message.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
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
-
-dnsqueue.o: dnsqueue.cpp ../include/base.h ../include/dnsqueue.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 dnsqueue.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
+       \$(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
@@ -1059,12 +1482,24 @@ 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
+       \$(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
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
+
 EOM
-close(FH);
+       foreach my $cmd (@cmdlist) {
+               print FH <<ITEM;
+cmd_$cmd.o: 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
+ITEM
+       }
+       close(FH);
 }
 
 sub write_dynamic_makefile {
@@ -1084,7 +1519,21 @@ sub write_dynamic_makefile {
        foreach my $cmd (@cmdlist) {
                $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
-       i}
+       }
+
+if (($config{OSNAME} !~ /Linux/i) && ($config{HAS_EXECINFO} eq "1")) {
+       $extra = "-L/usr/local/lib -lexecinfo";
+} else {
+       $extra = "";
+}
+
+$se = "socketengine_select";
+if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+       $se = "socketengine_kqueue";
+}
+elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+       $se = "socketengine_epoll";
+}
 
        open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;
@@ -1098,104 +1547,115 @@ sub write_dynamic_makefile {
 CC = im a cheezeball
 
 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: 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 libIRCDio.so libIRCDmessage.so $cmdobjs libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so inspircd
+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 libIRCDmessage.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
-       \$(CC) -I../include \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDio.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.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
+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 libIRCDmessage.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 libIRCDmessage.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
 
-libIRCDsocketengine.so: socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
-       \$(CC) -shared -o libIRCDsocketengine.so socketengine.o
+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
+
+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
 
 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) -shared -o libIRCDcommand_parse.so command_parse.o
+       \$(CC) -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) -shared -o libIRCDcull_list.so cull_list.o
+       \$(CC) -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) -shared -o libIRCDuserprocess.so userprocess.o
+       \$(CC) -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) -shared -o libIRCDhash.so hashcomp.o
+       \$(CC) -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../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
-       \$(CC) -shared -o libIRCDhelper.so helperfuncs.o
+       \$(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
 
 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) -shared -o libIRCDchannels.so channels.o
+       \$(CC) -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
+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
-       \$(CC) -shared -o libIRCDmode.so mode.o
+       \${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
 
 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
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
-       \$(CC) -shared -o libIRCDxline.so xline.o
+       \$(CC) -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) -shared -o libIRCDstring.so inspstring.o
+       \$(CC) -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
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
-       \$(CC) -shared -o libIRCDasyncdns.so dns.o
+       \$(CC) -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) -shared -o libIRCDbase.so base.o
+       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
 
-libIRCDio.so: inspircd_io.cpp ../include/base.h ../include/inspircd_io.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 inspircd_io.cpp
-       \$(CC) -shared -o libIRCDio.so inspircd_io.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
 
 libIRCDmessage.so: message.cpp ../include/base.h ../include/message.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 message.cpp
-       \$(CC) -shared -o libIRCDmessage.so message.o
+       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmessage.so message.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 $srcobjs
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
-       \$(CC) -shared -o libIRCDcommands.so commands.o $cmdobjs
-
-libIRCDdnsqueue.so: dnsqueue.cpp ../include/base.h ../include/dnsqueue.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 dnsqueue.cpp
-       \$(CC) -shared -o libIRCDdnsqueue.so dnsqueue.o
+       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o $cmdobjs
 
 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) -shared -o libIRCDdynamic.so dynamic.o
+       \$(CC) -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
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
-       \$(CC) -shared -o libIRCDusers.so users.o
+       \$(CC) -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
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
-       \$(CC) -shared -o libIRCDmodules.so modules.o
+       \$(CC) -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) -shared -o libIRCDwildcard.so wildcard.o
+       \$(CC) -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) -shared -o libIRCDsocket.so socket.o
+       \$(CC) -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
+       \$(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) -shared -o libIRCDaes.so aes.o
+       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDaes.so aes.o
+
+libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
+       \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
 
 EOM
        foreach my $cmd (@cmdlist) {
                print FH <<ITEM;
-cmd_$cmd.o: 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
+cmd_$cmd.o: 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
 
 ITEM