]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Fix indentation
[user/henk/code/inspircd.git] / configure
index c4e3f20ee8a324593f67f5e953a99056ae20916c..7897aec2d66f2af2e1044fb137e477f828217473 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,19 +1,18 @@
 #!/usr/bin/perl
-
+###################################################
 # InspIRCd Configuration Script
 #
-# Copyright 2002-2007 The ChatSpike Development Team
-# <brain@chatspike.net>
-# <Craig@chatspike.net>
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
 #
-# [14:21] Brain: <matrix impression> i know perl-fu!
+# Licensed under GPL, please see the COPYING file
+# for more information
 #
 # $Id$
 #
-########################################
-
+###################################################
 
-require 5.6.0;
+require 5.8.0;
 use Socket;
 use Cwd;
 use Getopt::Long;
@@ -21,18 +20,21 @@ use Getopt::Long;
 # Utility functions for our buildsystem
 use make::utilities;
 use make::configure;
+use make::gnutlscert;
+use make::opensslcert;
 
 GetOptions (
        'enable-gnutls' => \$opt_use_gnutls,
+       'rebuild' => \$opt_rebuild,
        'enable-openssl' => \$opt_use_openssl,
        'disable-interactive' => \$opt_nointeractive,
        'with-nick-length=i' => \$opt_nick_length,
        'with-channel-length=i' => \$opt_chan_length,
-       'with-max-channels=i' => \$opt_maxchans,
-       'with-max-oper-channels=i' => \$opt_opermaxchans,
        'with-max-clients=i' => \$opt_maxclients,
+       'enable-ports' => \$opt_ports,
        'enable-epoll' => \$opt_epoll,
        'enable-kqueue' => \$opt_kqueue,
+       'disable-ports' => \$opt_noports,
        'disable-epoll' => \$opt_noepoll,
        'disable-kqueue' => \$opt_nokqueue,
        'enable-ipv6' => \$opt_ipv6,
@@ -42,6 +44,7 @@ GetOptions (
        'with-ident-length=i' => \$opt_ident,
        'with-quit-length=i' => \$opt_quit,
        'with-topic-length=i' => \$opt_topic,
+       'with-maxbuf=i' => \$opt_maxbuf,
        'with-kick-length=i' => \$opt_kick,
        'with-gecos-length=i' => \$opt_gecos,
        'with-away-length=i' => \$opt_away,
@@ -81,6 +84,7 @@ my $non_interactive = (
        (defined $opt_noipv6links) ||
        (defined $opt_kqueue) ||
        (defined $opt_epoll) ||
+       (defined $opt_ports) ||
        (defined $opt_maxchans) ||
        (defined $opt_opermaxchans) ||
        (defined $opt_chan_length) ||
@@ -88,6 +92,8 @@ my $non_interactive = (
        (defined $opt_use_openssl) ||
        (defined $opt_nokqueue) ||
        (defined $opt_noepoll) ||
+       (defined $opt_noports) ||
+       (defined $opt_maxbuf) ||
        (defined $opt_use_gnutls)
 );
 my $interactive = !$non_interactive;
@@ -95,21 +101,21 @@ my $interactive = !$non_interactive;
 
 chomp($topdir = getcwd());
 $this = resolve_directory($topdir);                                            # PWD, Regardless.
-@modlist = ();                                                                 # Declare for Module List..
-%config = ();                                                                  # Initiate Configuration Hash..
-$config{ME}                 = resolve_directory($topdir);                      # Present Working Directory
+@modlist = ();                                                                 # Declare for Module List..
+%config = ();                                                                  # Initiate Configuration Hash..
+$config{ME}             = resolve_directory($topdir);                          # Present Working Directory
 
-$config{BASE_DIR}           = $config{ME};
+$config{BASE_DIR}         = $config{ME};
 
 if (defined $opt_base_dir)
 {
        $config{BASE_DIR} = $opt_base_dir;
 }
 
-$config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");            # Configuration Directory
-$config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");         # Modules Directory
-$config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");             # Binary Directory
-$config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");             # Library Directory
+$config{CONFIG_DIR}     = resolve_directory($config{BASE_DIR}."/conf");        # Configuration Directory
+$config{MODULE_DIR}     = resolve_directory($config{BASE_DIR}."/modules");     # Modules Directory
+$config{BINARY_DIR}     = resolve_directory($config{BASE_DIR}."/bin");         # Binary Directory
+$config{LIBRARY_DIR}   = resolve_directory($config{BASE_DIR}."/lib");          # Library Directory
 
 if (defined $opt_config_dir)
 {
@@ -128,57 +134,49 @@ if (defined $opt_library_dir)
        $config{LIBRARY_DIR} = $opt_library_dir;
 }
 chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL}  = `openssl version 2>/dev/null`);                  # Openssl version
+chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);          # Openssl version
+chomp($gnutls_ver = $config{HAS_GNUTLS});
+chomp($openssl_ver = $config{HAS_OPENSSL});
 $config{USE_GNUTLS}        = "n";
 if (defined $opt_use_gnutls)
 {
-       $config{USE_GNUTLS} = "y";                                              # Use gnutls.
+       $config{USE_GNUTLS} = "y";                                      # Use gnutls.
 }
-$config{USE_OPENSSL}        = "n";                                             # Use openssl.
+$config{USE_OPENSSL}   = "n";                                          # Use openssl.
 if (defined $opt_use_openssl)
 {
        $config{USE_OPENSSL} = "y";
 }
 
 # no, let's not change these.
-$config{OPTIMITEMP}         = "0";                                             # Default Optimisation Value
+$config{OPTIMITEMP}     = "0";                                         # Default Optimisation Value
 if (!defined $opt_disable_debug)
 {
-       $config{OPTIMISATI}         = "-g";                                     # Optimisation Flag
+       $config{OPTIMISATI}      = "-g1";                               # Optimisation Flag
 }
 else
 {
-       $config{OPTIMISATI}         = "";                                       # DEBUGGING OFF!
+       $config{OPTIMISATI}      = "-O2";                               # DEBUGGING OFF!
 }
 
-$config{NICK_LENGT}         = "31";                                            # Default Nick Length
+$config{NICK_LENGT}     = "31";                                        # Default Nick Length
 if (defined $opt_nick_length)
 {
        $config{NICK_LENGT} = $opt_nick_length;
 }
-$config{CHAN_LENGT}         = "64";                                            # Default Channel Name Length
+$config{CHAN_LENGT}     = "64";                                        # Default Channel Name Length
 if (defined $opt_chan_length)
 {
        $config{CHAN_LENGT} = $opt_chan_length;
 }
-$config{MAX_CHANNE}         = "20";                                            # Default Max. Channels per user
-if (defined $opt_maxchans)
-{
-       $config{MAX_CHANNE} = $opt_maxchans;
-}
-$config{MAX_OPERCH}         = "60";                                            # Default Max. Channels per oper
-if (defined $opt_opermaxchans)
-{
-       $config{MAX_OPERCH} = $opt_opermaxchans;
-}
-$config{MAXI_MODES}         = "20";                                            # Default Max. Number of Modes set at once.
+$config{MAXI_MODES}     = "20";                                        # Default Max. Number of Modes set at once.
 if (defined $opt_modes)
 {
        $config{MAXI_MODES} = $opt_modes;
 }
-$config{HAS_STRLCPY}        = "false";                                         # strlcpy Check.
-$config{HAS_STDINT}         = "false";                                         # stdint.h check
-$config{USE_KQUEUE}         = "y";                                             # kqueue enabled
+$config{HAS_STRLCPY}   = "false";                                      # strlcpy Check.
+$config{HAS_STDINT}     = "false";                                     # stdint.h check
+$config{USE_KQUEUE}     = "y";                                         # kqueue enabled
 if (defined $opt_kqueue)
 {
        $config{USE_KQUEUE} = "y";
@@ -187,7 +185,7 @@ if (defined $opt_nokqueue)
 {
        $config{USE_KQUEUE} = "n";
 }
-$config{USE_EPOLL}          = "y";                                             # epoll enabled
+$config{USE_EPOLL}       = "y";                                        # epoll enabled
 if (defined $opt_epoll)
 {
        $config{USE_EPOLL} = "y";
@@ -196,12 +194,21 @@ if (defined $opt_noepoll)
 {
        $config{USE_EPOLL} = "n";
 }
-$config{IPV6}               = "n";                                             # IPv6 support (experimental)
+$config{USE_PORTS}       = "y";                                        # epoll enabled
+if (defined $opt_ports)
+{
+       $config{USE_PORTS} = "y";
+}
+if (defined $opt_noports)
+{
+       $config{USE_PORTS} = "n";
+}
+$config{IPV6}         = "n";                                           # IPv6 support (experimental)
 if (defined $opt_ipv6)
 {
        $config{IPV6} = "y";
 }
-$config{SUPPORT_IP6LINKS}   = "y";                                             # IPv4 supporting IPv6 links (experimental)
+$config{SUPPORT_IP6LINKS}   = "y";                                     # IPv4 supporting IPv6 links (experimental)
 if (defined $opt_ipv6links)
 {
        $config{SUPPORT_IP6LINKS} = "y";
@@ -210,27 +217,37 @@ if (defined $opt_noipv6links)
 {
        $config{SUPPORT_IP6LINKS} = "n";
 }
-$config{STATIC_LINK}       = "no";                                             # are doing static modules?
-chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                          # FD Limit
-chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);                       # Hard FD Limit
-chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);                  # Major GCC Version
-$config{_SOMAXCONN} = SOMAXCONN;                                               # Max connections in accept queue
-$config{OSNAME}            = $^O;                                              # Operating System Name
+chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);                  # FD Limit
+chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);               # Hard FD Limit
+chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);          # Major GCC Version
+$config{_SOMAXCONN} = SOMAXCONN;                                       # Max connections in accept queue
+$config{OSNAME}            = $^O;                                      # Operating System Name
+$config{IS_DARWIN}          = "NO";                                    # Is OSX?
+$config{STARTSCRIPT}          = "inspircd";                    # start script?
+$config{DESTINATION}          = "BASE";                                # Is target path.
+$config{EXTRA_DIR}          = "";                                              # Is empty.
+if ($config{OSNAME} =~ /darwin/i)
+{
+       $config{IS_DARWIN} = "YES";
+       $config{STARTSCRIPT}          = "org.inspircd.plist";           # start script for OSX.
+       $config{DESTINATION}          = "LAUNCHDPATH";                          # Is OSX target.
+       $config{EXTRA_DIR}            = " launchd_dir";                         # Is OSX specific path.
+}
 $config{CC}                = "g++";                                            # C++ compiler
 if (defined $opt_cc)
 {
        $config{CC} = $opt_cc;
 }
 $exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}       = `$exec`);                                                # Major GCC Version
-$config{MAKEORDER}         = "ircd mods";                                      # build order
-$config{STATICLIBS}         = "";                                              # library archive path
-$config{MAX_IDENT}          = "12";                                            # max ident size
-$config{MAX_QUIT}           = "255";                                           # max quit message size
-$config{MAX_TOPIC}          = "307";                                           # max topic size
-$config{MAX_KICK}           = "255";                                           # max kick message size
-$config{MAX_GECOS}          = "128";                                           # max GECOS size
-$config{MAX_AWAY}           = "200";                                           # max AWAY size
+chomp($config{GCCVER}          = `$exec`);                             # Major GCC Version
+$config{MAKEORDER}             = "ircd mods";                          # build order
+$config{MAX_IDENT}             = "12";                                 # max ident size
+$config{MAX_QUIT}              = "255";                                # max quit message size
+$config{MAX_TOPIC}             = "307";                                # max topic size
+$config{MAX_KICK}              = "255";                                # max kick message size
+$config{MAX_GECOS}             = "128";                                # max GECOS size
+$config{MAX_AWAY}              = "200";                                # max AWAY size
+$config{MAXBUF}                        = "512";                                # Max buffer size
 if (defined $opt_ident)
 {
        $config{MAX_IDENT} = $opt_ident;
@@ -256,7 +273,7 @@ if (defined $opt_away)
        $config{MAX_AWAY} = $opt_away;
 }
 
-$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])?(\-[a-z][0-9])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
+$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
 $config{HAS_OPENSSL} = $1;
 
 if ($config{GCCVER} eq "") {
@@ -264,18 +281,9 @@ if ($config{GCCVER} eq "") {
        exit;
 }
 
-# Minihack! Convert Cygwin to 'Cyg-Static' so i can
-# Keep my dynamic module experiments here for later
-# consideration!
-
-if ($config{OSNAME} =~ /CYGWIN/i)
-{
-       $config{OSNAME} = "CYG-STATIC";
-}
-
 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..
@@ -288,52 +296,70 @@ sub clean
 
 sub update
 {
-       chomp($topdir = getcwd());
-       $this = resolve_directory($topdir);                                             # PWD, Regardless.
-       getmodules();
-       # Does the cache file exist?
-       if (!getcache()) {
-               # No, No it doesn't.. *BASH*
-               print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-               exit 0;
-       } else {
-               # We've Loaded the cache file and all our variables..
-               print "Updating Files..\n";
-               getosflags();
-               if ($opt_disable_debug == 1)
-               {
-                       print "Disabling debug information (-g).\n";
-                       $config{OPTIMISATI} = "";
+       eval {
+               chomp($topdir = getcwd());
+               $this = resolve_directory($topdir);                                          # PWD, Regardless.
+               getmodules();
+               # Does the cache file exist?
+               if (!getcache()) {
+                       # No, No it doesn't.. *BASH*
+                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+                       exit 0;
+               } else {
+                       # We've Loaded the cache file and all our variables..
+                       print "Updating Files..\n";
                        getosflags();
+                       if ($opt_disable_debug == 1)
+                       {
+                               print "Disabling debug information (-g).\n";
+                               $config{OPTIMISATI} = "";
+                               getosflags();
+                       }
+                       $has_epoll = $config{HAS_EPOLL};
+                       $has_ports = $config{HAS_PORTS};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(1);
+                       makecache();
+                       print "Complete.\n";
+                       exit;
                }
-               $has_epoll = $config{HAS_EPOLL};
-               $has_kqueue = $config{HAS_KQUEUE};
-               writefiles(1);
-               print "Complete.\n";
-               exit;
+       };
+       if ($@)
+       {
+               print "Configure update failed: $@\n";
        }
+       exit;
 }
 
 sub modupdate
 {
-       chomp($topdir = getcwd());
-       $this = resolve_directory($topdir);                                             # PWD, Regardless.
-       getmodules();
-        # Does the cache file exist?
-        if (!getcache()) {
-                # No, No it doesn't.. *BASH*
-                print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-                exit 0;
-        } else {
-                # We've Loaded the cache file and all our variables..
-                print "Updating Files..\n";
-                getosflags();
-                $has_epoll = $config{HAS_EPOLL};
-                $has_kqueue = $config{HAS_KQUEUE};
-                writefiles(0);
-                print "Complete.\n";
-                exit;
-        }
+       eval {
+               chomp($topdir = getcwd());
+               $this = resolve_directory($topdir);                                          # PWD, Regardless.
+               getmodules();
+               # Does the cache file exist?
+               if (!getcache()) {
+                       # No, No it doesn't.. *BASH*
+                       print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+                       exit 0;
+               } else {
+                       # We've Loaded the cache file and all our variables..
+                       print "Updating Files..\n";
+                       getosflags();
+                       $has_epoll = $config{HAS_EPOLL};
+                       $has_ports = $config{HAS_PORTS};
+                       $has_kqueue = $config{HAS_KQUEUE};
+                       writefiles(0);
+                       makecache();
+                       print "Complete.\n";
+                       exit;
+               }
+       };
+       if ($@)
+       {
+               print "Module update failed: $@\n";
+       }
+       exit;
 }
 
 
@@ -346,9 +372,13 @@ sub svnupdate
                print "This is not an SVN copy of InspIRCd.\n";
                exit;
        }
+       else
+       {
+               close(FH);
+       }
        system("svn update");
        system("perl configure -update");
-       if ($ARGV[1] eq "rebuild") {
+       if (defined $opt_rebuild) {
                system("make install");
        }
        exit;
@@ -356,7 +386,7 @@ sub svnupdate
 
 print "Running non-interactive configure...\n" unless $interactive;
 print "Checking for cache from previous configure... ";
-print ((getcache() eq "true") ? "found\n" : "not found\n");
+print ((!getcache()) ? "not found\n" : "found\n");
 print "Checking operating system version... ";
 print getosflags() . "\n";
 
@@ -407,8 +437,8 @@ $has_kqueue = 0;
 $fail = 0;
 open(KQUEUE, "</usr/include/sys/event.h") or $fail = 1;
 if (!$fail) {
-        while (chomp($line = <KQUEUE>)) {
-                # try and find the delcaration of:
+       while (chomp($line = <KQUEUE>)) {
+               # try and find the delcaration of:
                # int kqueue(void);
                if ($line =~ /int(\0x9|\s)+kqueue/) {
                        $has_kqueue = 1;
@@ -430,16 +460,73 @@ if (!$fail) {
 if ($has_epoll) {
        my $kernel = `uname -r`;
        chomp($kernel);
-       if (($kernel =~ /2\.0/) || ($kernel =~ /2\.2/) || ($kernel =~ /2\.4/)) {
+       if (($kernel =~ /^2\.0\./) || ($kernel =~ /^2\.2\./) || ($kernel =~ /^2\.4\./)) {
                $has_epoll = 0;
        }
+       else
+       {
+               # Suggestion from nenolod, weed out odd systems which have glibc built
+               # against 2.4 kernels (ick)
+               my $kernel_arch = `uname -p`;
+               chomp($kernel_arch);
+               $libcv = 0.0;
+               $kernelv = 0.0;
+               if ($kernel_arch =~ /x86_64/) {
+                       open (FH,"/lib64/libc.so.6|") or $has_epoll = 0;
+               }
+               else {
+                       open (FH,"/lib/libc.so.6|") or $has_epoll = 0;
+               }
+               if ($has_epoll)
+               {
+                       while (chomp($line = <FH>))
+                       {
+                               if ($line =~ /GNU C Library .* version (.*?) /)
+                               {
+                                       $libcv = $1;
+                                       $libcv =~  /(\d+\.\d+)/;
+                                       $libcv = $1;
+                               }
+                               elsif ($line =~ /Compiled on a Linux (.*?\..*?)\.* system/)
+                               {
+                                       $kernelv = $1;
+                                       # Fix for some retarded libc builds, strip off >> and << etc.
+                                       $kernelv =~ /(\d+\.\d+)/;
+                                       $kernelv = $1;
+                               }
+                       }
+                       close FH;
+                       if ($libcv < 2.3)
+                       {
+                               $has_epoll = 0;
+                               printf "libc too old: $libcv... ";
+                       }
+                       if ($kernelv < 2.6)
+                       {
+                               $has_epoll = 0;
+                               printf "libc built against older kernel $kernelv... ";
+                       }
+               }
+       }
 }
 print "yes\n" if $has_epoll == 1;
 print "no\n" if $has_epoll == 0;
 
-if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
-       $config{HAS_STRLCPY} = "true";
+printf "Checking if Solaris I/O completion ports are available... ";
+$has_ports = 0;
+my $system = `uname -s`;
+chomp ($system);
+$has_ports = 1 if ($system eq "SunOS");
+
+if ($has_ports) {
+       my $kernel = `uname -r`;
+       chomp($kernel);
+       if (($kernel !~ /^5\.1./)) {
+               $has_ports = 0;
+       }
 }
+print "yes\n" if $has_ports == 1;
+print "no\n" if $has_ports == 0;
 
 $config{HAS_EPOLL} = $has_epoll;
 $config{HAS_KQUEUE} = $has_kqueue; 
@@ -462,8 +549,38 @@ if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPE
        $config{HAS_OPENSSL} = "n";
 }
 
+printf "Checking if you are running an ancient, unsupported OS... ";
+if ($config{OSNAME} =~ /FreeBSD/i)
+{
+       $version = `uname -r`;
+       if ($version =~ /^4\./)
+       {
+               $foundit = `ls -l /usr/local/lib/libgnugetopt* | wc -l`;
+               if ($foundit > 0)
+               {
+                       # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE!
+                       $config{CRAQ} = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1";
+                       print "yes\n";
+               }
+               else
+               {
+                       print "\n\nERROR: You require libgnugetopt (from ports or packages) to build InspIRCd on FreeBSD 4.11.\n";
+               }
+       }
+       else
+       {
+               $config{CRAQ} = " ";
+               print "no ($version)\n";
+       }
+}
+else
+{
+       $config{CRAQ} = " ";
+       print "no ($config{OSNAME})\n";
+}
+
 ################################################################################
-#                          BEGIN INTERACTIVE PART                              #
+#                        BEGIN INTERACTIVE PART                              #
 ################################################################################
 
 # Clear the Screen..
@@ -528,10 +645,10 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        my $tmpbase = $config{BASE_DIR};
        dir_check("do you wish to install the InspIRCd base", "BASE_DIR");
        if ($tmpbase ne $config{BASE_DIR}) {
-               $config{CONFIG_DIR}         = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Dir
-               $config{MODULE_DIR}         = resolve_directory($config{BASE_DIR}."/modules");        # Modules Directory
-               $config{BINARY_DIR}         = resolve_directory($config{BASE_DIR}."/bin");            # Binary Directory
-               $config{LIBRARY_DIR}        = resolve_directory($config{BASE_DIR}."/lib");            # Library Directory
+               $config{CONFIG_DIR}      = resolve_directory($config{BASE_DIR}."/conf");           # Configuration Dir
+               $config{MODULE_DIR}      = resolve_directory($config{BASE_DIR}."/modules");     # Modules Directory
+               $config{BINARY_DIR}      = resolve_directory($config{BASE_DIR}."/bin");     # Binary Directory
+               $config{LIBRARY_DIR}    = resolve_directory($config{BASE_DIR}."/lib");      # Library Directory
        }
 
        dir_check("are the configuration files", "CONFIG_DIR");
@@ -547,7 +664,11 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                yesno(USE_EPOLL,"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
                print "\n";
        }
-       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y"));
+       if ($has_ports) {
+               yesno(USE_PORTS,"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
+               print "\n";
+       }
+       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
        if (!$chose_hiperf) {
                print "No high-performance socket engines are available, or you chose\n";
                print "not to enable one. Defaulting to select() engine.\n\n";
@@ -557,18 +678,20 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        print "\n";
 
        if ($config{IPV6} eq "y") {
-               print "You have chosen to build an \033[1;32mIPV6-only\033[0m server.\nTo accept IPV4 users, you must use the '::ffff:' notation of addresses.\n\n";
+               print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
                $config{SUPPORT_IP6LINKS} = "y";
        } else {
-               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers which are using '::ffff:' notation?\nIf you are using a recent operating\nsystem and are unsure, answer yes.");
+               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
                print "\n";
        }
 
        if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
-               print "I have detected both GnuTLS and OpenSSL on your system.\n";
+               print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
                print "I will default to GnuTLS. If you wish to use OpenSSL\n";
                print "instead, you should enable the OpenSSL module yourself\n";
                print "by copying it from src/modules/extra to src/modules.\n\n";
+               print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
+               print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
        }
 
        if ($config{HAS_GNUTLS} eq "y") {
@@ -582,6 +705,9 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                        print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
                }
        }
+       else {
+               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+       }
 
        print "\nThe following questions will ask you for various figures relating\n";
        print "To your IRCd install. Please note that these should usually be left\n";
@@ -598,8 +724,6 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 
        promptnumeric("length of nicknames", "NICK_LENGT");
        promptnumeric("length of channel names", "CHAN_LENGT");
-       promptnumeric("number of channels a normal user may join at any one time", "MAX_CHANNE");
-       promptnumeric("number of channels an oper may join at any one time", "MAX_OPERCH");
        promptnumeric("number of mode changes in one line", "MAXI_MODES");
        promptnumeric("length of an ident (username)", "MAX_IDENT");
        promptnumeric("length of a quit message", "MAX_QUIT");
@@ -630,7 +754,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_gnutls.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -650,14 +773,18 @@ if ($config{USE_GNUTLS} eq "y") {
 * few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-                       system("certtool --generate-privkey --outfile key.pem");
-                       system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
-                       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"
+                       $failed = make_gnutls_cert();
+                       if ($failed) {
+                               print "\n\033[1;32mCertificate generation failed!\033[0m\n\n";
+                       } else {
+                               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";
                }
        }
        else
@@ -672,7 +799,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_openssl.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -689,8 +815,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the certificates may take some time, go grab a *
 * coffee, or something.                                     *
 *************************************************************\n\n";
-                       system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
-                       system("openssl dhparam -out dhparams.pem 1024");
+                       make_openssl_cert();
                        print "\nCertificate generation complete, copying to config directory... ";
                        system("mv key.pem $config{CONFIG_DIR}/key.pem");
                        system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -710,8 +835,8 @@ if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
 }
 
 getosflags();
-makecache();
 writefiles(1);
+makecache();
 
 print "\n\n";
 print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
@@ -737,23 +862,23 @@ FOO2
 }
 
 ################################################################################
-#                              HELPER FUNCTIONS                                #
+#                            HELPER FUNCTIONS                          #
 ################################################################################
 sub getcache {
        # Retrieves the .config.cache file, and loads values into the main config hash.
-       open(CACHE, ".config.cache") or return undef;
+       open(CACHE, ".config.cache") or return 0;
        while (<CACHE>) {
                chomp;
                # Ignore Blank lines, and comments..
                next if /^\s*$/;
                next if /^\s*#/;
-               my ($key, $value) = split("=", $_);
+               my ($key, $value) = split("=", $_, 2);
                $value =~ /^\"(.*)\"$/;
                # Do something with data here!
                $config{$key} = $1;
        }
        close(CONFIG);
-       return "true";
+       return 1;
 }
 
 sub makecache {
@@ -822,11 +947,20 @@ sub dir_check {
 sub getosflags {
 
        $config{LDLIBS} = "-lstdc++";
-       $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+       $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+       $config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated -g";
+       $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
        $config{MAKEPROG} = "make";
 
+       if ($config{OSNAME} =~ /darwin/i) {
+               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+               $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
+               $config{LDLIBS} = "-ldl -lstdc++";
+       }
+
        if ($config{OSNAME} =~ /OpenBSD/i) {
                $config{MAKEPROG} = "gmake";
+               $config{LDLIBS} = $config{LDLIBS} . " -lunwind";
                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
@@ -840,28 +974,18 @@ sub getosflags {
 
        if ($config{OSNAME} =~ /Linux/i) {
                $config{LDLIBS} = "-ldl -lstdc++";
-               $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
                $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
+               $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
                $config{MAKEPROG} = "make";
-               if ($config{OSNAME} =~ /CYGWIN/) {
-                       $config{FLAGS}  = "-fno-strict-aliasing -Wall -Woverloaded-virtual $config{OPTIMISATI}";
-                       $config{LDLIBS} = "";
-                       $config{MAKEPROG} = "/usr/bin/make";
-                       $config{MAKEORDER} = "ircd mods";
-                       return "Cygwin";
-               } elsif ($config{OSNAME} eq "CYG-STATIC") {
-                       $config{FLAGS} = "-fno-strict-aliasing -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";
-                       return "Cygwin-Static";
-               }
+       }
+
+       if ($config{OSNAME} =~ /FreeBSD/i) {
                $config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
+               $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
        }
-       
-       if ($config{OSNAME} =~ /SunOS/i)
+
+       if ($config{OSNAME} =~ /SunOS/i or $config{OSNAME} =~ /solaris/i)
        {
                # solaris/sunos needs these
                # socket = bsd sockets api
@@ -869,7 +993,7 @@ sub getosflags {
                # rt = POSIX realtime extensions
                # resolv = inet_aton only (why isnt this in nsl?!)
                $config{MAKEPROG} = "gmake";
-               $config{LDLIBS} = $config{LDLIBS} . " -lsocket -lnsl -lrt -lresolv";
+               $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv";
                return "Solaris";
        }
        
@@ -887,9 +1011,7 @@ sub writefiles {
        my($writeheader) = @_;
        # First File.. inspircd_config.h
        chomp(my $incos = `uname -n -s -r`);
-       chomp(my $version = `sh ./src/version.sh`);
-        chomp(my $revision = getrevision());
-       $version = "$version(r$revision)";
+       chomp($version = `sh src/version.sh`);
        chomp(my $revision2 = getrevision());
        if ($writeheader == 1)
        {
@@ -902,6 +1024,10 @@ sub writefiles {
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
 
+/* this is for windows support. */
+#define CoreExport /**/
+#define DllExport /**/
+
 #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define VERSION "$version"
@@ -912,8 +1038,6 @@ sub writefiles {
 #define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
 #define CHANMAX $CL
-#define MAXCHANS $config{MAX_CHANNE}
-#define OPERMAXCHANS $config{MAX_OPERCH}
 #define MAXMODES $config{MAXI_MODES}
 #define IDENTMAX $config{MAX_IDENT}
 #define MAXQUIT $config{MAX_QUIT}
@@ -924,24 +1048,15 @@ sub writefiles {
 #define OPTIMISATION $config{OPTIMITEMP}
 #define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
-#define MAXBUF 514
 EOF
+print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
+
                if ($config{OSNAME} =~ /SunOS/i) {
                        print FILEHANDLE "#define IS_SOLARIS\n";
                }
-               if ($config{OSNAME} =~ /CYGWIN/i) {
-                       print FILEHANDLE "#define IS_CYGWIN\n";
-                       print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE        1024\n#endif\n";
-               }
                if ($config{OSNAME} =~ /MINGW32/i) {
                        print FILEHANDLE "#define IS_MINGW\n";
                }
-               if ($config{OSNAME} =~ /CYG-STATIC/i) {
-                       print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
-               }
-               if ($config{STATIC_LINK} eq "yes") {
-                       print FILEHANDLE "#define STATIC_LINK\n";
-               }
                if ($config{GCCVER} >= 3) {
                        print FILEHANDLE "#define GCC3\n";
                }
@@ -968,6 +1083,11 @@ EOF
                        $se = "socketengine_epoll";
                        $use_hiperf = 1;
                }
+               if (($has_ports) && ($config{USE_PORTS} eq "y")) {
+                       print FILEHANDLE "#define USE_PORTS\n";
+                       $se = "socketengine_ports";
+                       $use_hiperf = 1;
+               }
                # user didn't choose either epoll or select for their OS.
                # default them to USE_SELECT (ewwy puke puke)
                if (!$use_hiperf) {
@@ -998,12 +1118,7 @@ EOF
        my $modules = "";
        foreach $i (@modlist)
        {
-               if ($config{STATIC_LINK} eq "yes") {
-                       $modules .= "m_".$i.".o ";
-               }
-               else {
-                       $modules .= "m_".$i.".so ";
-               }
+               $modules .= "m_".$i.".so ";
        }
        chomp($modules);   # Remove Redundant whitespace..
 
@@ -1024,10 +1139,6 @@ EOF
        my $file = "";
        my $exe = "inspircd";
 
-       if ($config{OSNAME} =~ /CYGWIN/i) {
-               $exe = "inspircd.exe";
-       }
-
        opendir(DIRHANDLE, $this);
 
        # Do this once here, and cache it in the .*.inc files,
@@ -1039,12 +1150,21 @@ EOF
        chomp(my $revision = getrevision());
        $version = "$version(r$revision)";
 
+       my $LIBEXT = "so";
+       if ($config{IS_DARWIN} eq "YES")
+       {
+               $LIBEXT = "dylib";
+       }
        # We can actually parse any file starting with . and ending with .inc,
        # but right now we only parse .inspircd.inc to form './inspircd'
 
        foreach $name (sort readdir(DIRHANDLE)) {
                if ($name =~ /^\.(.+)\.inc$/) {
                        $file = $1;
+
+                       # Bug #353, omit this on non-darwin
+                       next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist"));
+
                        # All .name.inc files need parsing!
                        $tmp = "";
                        open(FILEHANDLE, ".$file.inc");
@@ -1056,16 +1176,20 @@ EOF
                        $tmp =~ s/\@CC\@/$config{CC}/;
                        $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
                        $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
+                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
                        $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
                        $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
                        $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
                        $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
                        $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
                        $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
+                       $tmp =~ s/\@LIBRARY_EXT\@/$LIBEXT/;
                        $tmp =~ s/\@MODULES\@/$modules/;
+                       $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/;
+                       $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/;
+                       $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/;
                        $tmp =~ s/\@EXECUTABLE\@/$exe/;
                        $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
-                       $tmp =~ s/\@STATICLIBS\@/$config{STATICLIBS}/;
                        $tmp =~ s/\@VERSION\@/$version/;
 
                        print "Writing \033[1;32m$file\033[0m\n";
@@ -1078,143 +1202,49 @@ EOF
        # 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/i) {
-               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();
-       }
+       print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
+       write_dynamic_makefile();
+       write_dynamic_modules_makefile();
 }
 
-sub write_static_modules_makefile {
+sub write_dynamic_modules_makefile {
        # Modules Makefile..
        print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
        open(FILEHANDLE, ">src/modules/Makefile");
 
-       ###
-       # Module Makefile Header
-       ###
+###
+# 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.
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
+#
+# 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
+# Automatically Generated by ./configure to add a
+#  modules please run ./configure -modupdate
+###################################################
 
 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";
+if ($config{OSNAME} =~ /darwin/) {
+               print FILEHANDLE <<EOCHEESE;
 
-       ###
-       # Build Module Crap
-       ###
-       foreach $i (@modlist)
-       {
-               if ($i !~ /_static$/) {
-                       $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
-                       $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
-                       $deps = getdependencies("src/modules/m_".$i.".cpp");
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle
 
-                       #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+EOCHEESE
+} else {
+               print FILEHANDLE <<EOCHEESE;
 
-                       ###
-                       # 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 $deps
-       \$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c .m_$i\_static.cpp
-       mv .m_$i\_static.o ../m_$i.o
+PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
 
 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/i) {
-               $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
        ###
@@ -1237,9 +1267,7 @@ EOF
        
                print FILEHANDLE <<EOCHEESE;
 m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
-       \$(CC) -pipe -I../../include \$(FLAGS) $cmflags -export-dynamic -c m_$i.cpp
-       \$(CC) -pipe \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
-
+       \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
 EOCHEESE
                $crud = $crud . "       install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
 ###
@@ -1250,30 +1278,21 @@ EOCHEESE
        opendir(DIRHANDLE, "src/modules");
        foreach $name (sort readdir(DIRHANDLE)) {
                if ($name =~ /^m_(.+?)$/) {
-                       $crapola = "";
-                       $crap3 = "";
+                       $mfrules = "";
+                       $mobjs = "";
+                       $mliflags = "";
+                       $mfcount = 0;
                        # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
                        if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
-                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... ";
-                               my $i = 0;
-                               print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h"; 
-                               foreach $fname (sort readdir(MDIRHANDLE)) {
-                                       if ($fname =~ /\.cpp$/) {
-                                               $cmflags = getcompilerflags("src/modules/$name/$fname");
-                                               $liflags = getlinkerflags("src/modules/$name/$fname");
-                                               $deps = getdependencies("src/modules/$name/$fname");
-                                               $oname = $fname;
-                                               $oname =~ s/\.cpp$/.o/g;
-                                               print FILEHANDLE " $name/$oname";
-                                               $crapola = $crapola .  "$name/$oname: $name/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
-                                               $crapola = $crapola .  "        \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $name/$oname -c $name/$fname\n\n";
-                                               $crap3 = $crap3 . " $name/$oname";
-                                               $i++;
-                                       }
+                               read_module_directory("src/modules/$name", $name);
+                               print "Composing Makefile rules for directory \033[1;32m$name\033[0m... (\033[1;32m$mfcount files found\033[0m)\n";
+                               print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n"; 
+                               if ($config{IS_DARWIN} eq "YES") {
+                                       print FILEHANDLE "      \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n"; 
+                               } else {
+                                       print FILEHANDLE "      \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n";
                                }
-                               print "(\033[1;32m$i files found\033[0m)\n";
-                               print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
-                               print FILEHANDLE "\n$crapola\n";
+                               print FILEHANDLE "\n$mfrules\n";
                                closedir(MDIRHANDLE);
                                $crud = $crud . "       install -m \$(INSTMODE) $name.so \$(MODPATH)\n";
                        }
@@ -1284,31 +1303,75 @@ EOCHEESE
        print FILEHANDLE "modinst:\n    \@echo \"Installing modules...\"\n" . $crud;
 }
 
+sub read_module_directory {
+       my ($dpath, $reldpath) = @_;
+       
+       if (opendir(MDIRHANDLE, $dpath) == 0) {
+               return;
+       }
+       
+       foreach $fname (sort readdir(MDIRHANDLE)) {
+               if ($fname =~ /\.cpp$/) {
+                       $cmflags = getcompilerflags("$dpath/$fname");
+                       $mliflags = $mliflags . " " . getlinkerflags("$dpath/$fname");
+                       $deps = getdependencies("$dpath/$fname");
+                       $oname = $fname;
+                       $oname =~ s/\.cpp$/.o/g;
+                       $mfrules = $mfrules .  "$reldpath/$oname: $reldpath/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
+                       $mfrules = $mfrules .  "        \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $reldpath/$oname -c $reldpath/$fname\n\n";
+                       $mobjs = $mobjs . " $reldpath/$oname";
+                       $mfcount++;
+               }
+               elsif ((-d "$dpath/$fname") && !($fname eq ".") && !($fname eq "..")) {
+                       read_module_directory($dpath."/".$fname, $reldpath."/".$fname);
+               }
+       }
+}
+
+sub write_dynamic_makefile {
 
-sub write_static_makefile {
-       open(FH,">src/Makefile") or die("Could not write src/Makefile!");
-        my $i = 0;
-        my @cmdlist = ();
-        opendir(DIRHANDLE, "src");
-        foreach $name (sort readdir(DIRHANDLE)) {
-                if ($name =~ /^cmd_(.+)\.cpp$/) {
-                        $cmdlist[$i++] = $1;
-                }
-        }
-        closedir(DIRHANDLE);
-        my $cmdobjs = "";
+       my $i = 0;
+       my @cmdlist = ();
+       opendir(DIRHANDLE, "src");
+       foreach $name (sort readdir(DIRHANDLE)) {
+               if ($name =~ /^cmd_(.+)\.cpp$/) {
+                       $cmdlist[$i++] = $1;
+               }
+       }
+       closedir(DIRHANDLE);
+
+       my $cmdobjs = "";
        my $srcobjs = "";
-        foreach my $cmd (@cmdlist) {
-                $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
-                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
+       foreach my $cmd (@cmdlist) {
+               $cmdobjs = $cmdobjs . "cmd_$cmd.so ";
+               $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
+       }
+
+       $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";
+       }
+       elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+               $se = "socketengine_ports";
        }
+
+       $freebsd4libs = $config{CRAQ};
+
+       open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;
-# Insp Makefile :p
+###################################################
+# Copyright 2002-2007 The InspIRCd Development Team
+#  http://www.inspircd.org/wiki/index.php/Credits
 #
-# (C) ChatSpike development team
-# Makefile by <Craig\@ChatSpike.net>
-# Makefile version 2 (statically linked core) by <brain\@inspircd.org>
+# Thanks to Andrew Church <achurch\@achurch.org>
+#  for assisting with making this work right.
 #
+# This file is automagically generated by configure 
+# Any changes made will be lost on ./configure         
+###################################################
 
 CC = im a cheezeball
 
@@ -1318,167 +1381,121 @@ RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//
 
 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";
-}
-
-       ###
-       # 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/i) {
-               print FH <<EOM;
-all: timer.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o snomasks.o inspircd.exe
-
-inspircd.exe: inspircd.dll.a
-       \$(CC) -o \$@ \$^
-
-inspircd.dll inspircd.dll.a: inspircd.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs  commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o timer.o snomasks.o
-       \$(CC) -shared -Wl,--out-implib=inspircd.dll.a -o inspircd.dll \$^
-EOM
-       } else {
-               print FH <<EOM;
-all: timer.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o snomasks.o \$(MODULES) inspircd.exe
-
-inspircd.exe: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/base.h
-       \$(CC) -I../include \$(FLAGS) inspircd.cpp -o inspircd.exe \$(LDLIBS) channels.o mode.o xline.o inspstring.o dns.o base.o inspsocket.o configreader.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o timer.o snomasks.o modes/modeclasses.a \$(MODULES)
-EOM
-       }
-
+if ($config{IS_DARWIN} eq "YES") {
        print FH <<EOM;
+all: libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDsnomasks.dylib libIRCDserver.dylib libIRCDfilelogger.dylib inspircd
 
-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
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h $cmdobjs libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDsnomasks.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDserver.dylib libIRCDfilelogger.dylib
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp
+       \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDhash.dylib libIRCDsocket.dylib libIRCDsocketengine.dylib libIRCDuserprocess.dylib libIRCDcull_list.dylib libIRCDcommand_parse.dylib libIRCDtimer.dylib libIRCDsnomasks.dylib libIRCDserver.dylib libIRCDfilelogger.dylib
 
-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
+libIRCDsocketengine.dylib: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $se.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocketengine.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocketengine.dylib socketengine.o $se.o
+
+libIRCDsnomasks.dylib: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsnomasks.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsnomasks.dylib snomasks.o
 
-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
+libIRCDcommand_parse.dylib: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcommand_parse.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommand_parse.dylib command_parse.o
 
-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
+libIRCDcull_list.dylib: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcull_list.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcull_list.dylib cull_list.o
 
-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
+libIRCDuserprocess.dylib: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDuserprocess.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDuserprocess.dylib userprocess.o
 
-hashcomp.o: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDhash.dylib: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhash.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhash.dylib hashcomp.o
 
-helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDhelper.dylib: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhelper.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhelper.dylib helperfuncs.o
 
-channels.o: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDchannels.dylib: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDchannels.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDchannels.dylib channels.o
 
-mode.o: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES) modes/modeclasses.a
-       \${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS)
+libIRCDmode.dylib: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
+       \${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDmode.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmode.dylib mode.o modes/modeclasses.a
 
-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
+libIRCDxline.dylib: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDxline.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDxline.dylib xline.o
 
-inspstring.o: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDstring.dylib: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDstring.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDstring.dylib inspstring.o
 
-dns.o: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+libIRCDasyncdns.dylib: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDasyncdns.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDasyncdns.dylib dns.o
 
-base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
+libIRCDbase.dylib: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDbase.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDbase.dylib base.o
 
-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
+libIRCDconfigreader.dylib: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDconfigreader.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDconfigreader.dylib configreader.o
 
-commands.o: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h $srcobjs
-       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp $cmdobjs
+libIRCDcommands.dylib: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcommands.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommands.dylib commands.o
 
-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
+libIRCDdynamic.dylib: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDdynamic.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDdynamic.dylib dynamic.o
 
-users.o: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+libIRCDusers.dylib: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDusers.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDusers.dylib users.o
 
-modules.o: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+libIRCDmodules.dylib: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDmodules.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmodules.dylib modules.o
 
-wildcard.o: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDwildcard.dylib: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c wildcard.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDwildcard.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDwildcard.dylib wildcard.o
 
-socket.o: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+libIRCDsocket.dylib: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
-       
-inspsocket.o: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocket.dylib socket.o
+
+libIRCDinspsocket.dylib: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDinspsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDinspsocket.dylib inspsocket.o
 
-timer.o: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+libIRCDtimer.dylib: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDtimer.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDtimer.dylib timer.o
 
-EOM
-       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 {
+libIRCDserver.dylib: server.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c server.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDserver.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDserver.dylib server.o
 
-       my $i = 0;
-       my @cmdlist = ();
-       opendir(DIRHANDLE, "src");
-       foreach $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^cmd_(.+)\.cpp$/) {
-                       $cmdlist[$i++] = $1;
-               }
-       }
-       closedir(DIRHANDLE);
+libIRCDfilelogger.dylib: filelogger.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c filelogger.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDfilelogger.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDfilelogger.dylib filelogger.o
 
-       my $cmdobjs = "";
-       my $srcobjs = "";
-       foreach my $cmd (@cmdlist) {
-               $cmdobjs = $cmdobjs . "cmd_$cmd.so ";
-               $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
-       }
+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";
-       }
+} else {
 
-       open(FH,">src/Makefile") or die("Could not write src/Makefile");
        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>
-#
-
-CC = im a cheezeball
+all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so libIRCDserver.so libIRCDfilelogger.so inspircd
 
-CXXFLAGS = -I../include \${FLAGS}
-CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
-RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
-
-all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
-
-inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
-       \$(CC) -pipe -I../include $extra -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDserver.so libIRCDfilelogger.so
+       \$(CC) -pipe -I../include -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so libIRCDserver.so libIRCDfilelogger.so
 
 libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
@@ -1569,12 +1586,21 @@ libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/gl
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
 
+libIRCDserver.so: server.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c server.cpp
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDserver.so server.o
+
+libIRCDfilelogger.so: filelogger.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c filelogger.cpp
+       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDfilelogger.so filelogger.o
+
 EOM
+}
        foreach my $cmd (@cmdlist) {
                print FH <<ITEM;
 cmd_$cmd.so: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-       \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o cmd_$cmd.so cmd_$cmd.o
+       \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
 
 ITEM
        }