]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - configure
Windows support. Tested and working to compile on freebsd and linux. Next step is...
[user/henk/code/inspircd.git] / configure
index 4a0556bb39b7f373ea5ddb30559a2886ca28c2fd..e1bcc153d55f46b65f769f3724ac3a115c72245a 100755 (executable)
--- a/configure
+++ b/configure
@@ -6,13 +6,15 @@
 # <brain@chatspike.net>
 # <Craig@chatspike.net>
 #
+# Licensed under GPL, please see the COPYING file
+# for more information
+#
 # [14:21] Brain: <matrix impression> i know perl-fu!
 #
 # $Id$
 #
 ########################################
 
-
 require 5.6.0;
 use Socket;
 use Cwd;
@@ -21,18 +23,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 +47,7 @@ GetOptions (
        'with-ident-length=i' => \$opt_ident,
        'with-quit-length=i' => \$opt_quit,
        'with-topic-length=i' => \$opt_topic,
+       'with-maxbuf=i' => \$opt_maxbuf,
        'with-kick-length=i' => \$opt_kick,
        'with-gecos-length=i' => \$opt_gecos,
        'with-away-length=i' => \$opt_away,
@@ -81,6 +87,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 +95,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,9 +104,9 @@ 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};
 
@@ -106,8 +115,8 @@ 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{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
 
@@ -128,11 +137,13 @@ 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.
 if (defined $opt_use_openssl)
@@ -141,14 +152,14 @@ if (defined $opt_use_openssl)
 }
 
 # 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
@@ -161,23 +172,13 @@ 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.
 if (defined $opt_modes)
 {
        $config{MAXI_MODES} = $opt_modes;
 }
 $config{HAS_STRLCPY}   = "false";                                      # strlcpy Check.
-$config{HAS_STDINT}     = "false";                                             # stdint.h check
+$config{HAS_STDINT}     = "false";                                     # stdint.h check
 $config{USE_KQUEUE}     = "y";                                         # kqueue enabled
 if (defined $opt_kqueue)
 {
@@ -187,7 +188,7 @@ if (defined $opt_nokqueue)
 {
        $config{USE_KQUEUE} = "n";
 }
-$config{USE_EPOLL}       = "y";                                                # epoll enabled
+$config{USE_EPOLL}       = "y";                                        # epoll enabled
 if (defined $opt_epoll)
 {
        $config{USE_EPOLL} = "y";
@@ -196,12 +197,21 @@ if (defined $opt_noepoll)
 {
        $config{USE_EPOLL} = "n";
 }
+$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 +220,33 @@ if (defined $opt_noipv6links)
 {
        $config{SUPPORT_IP6LINKS} = "n";
 }
-$config{STATIC_LINK}       = "no";                                             # are doing static modules?
+$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
+chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);               # Hard FD Limit
+chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);          # Major GCC Version
+$config{_SOMAXCONN} = SOMAXCONN;                                       # Max connections in accept queue
 $config{OSNAME}            = $^O;                                      # Operating System Name
+$config{IS_DARWIN}          = "NO";                                    # Is OSX?
+if ($config{OSNAME} =~ /darwin/i)
+{
+       $config{IS_DARWIN} = "YES";
+}
 $config{CC}                = "g++";                                            # C++ compiler
 if (defined $opt_cc)
 {
        $config{CC} = $opt_cc;
 }
 $exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}       = `$exec`);                                                # Major GCC Version
-$config{MAKEORDER}         = "ircd mods";                                      # build order
-$config{STATICLIBS}     = "";                                          # library archive path
-$config{MAX_IDENT}       = "12";                                               # max ident size
-$config{MAX_QUIT}         = "255";                                             # max quit message size
-$config{MAX_TOPIC}       = "307";                                              # max topic size
-$config{MAX_KICK}         = "255";                                             # max kick message size
-$config{MAX_GECOS}       = "128";                                              # max GECOS size
-$config{MAX_AWAY}         = "200";                                             # max AWAY size
+chomp($config{GCCVER}          = `$exec`);                             # Major GCC Version
+$config{MAKEORDER}             = "ircd mods";                          # build order
+$config{STATICLIBS}            = "";                                   # library archive path
+$config{MAX_IDENT}             = "12";                                 # max ident size
+$config{MAX_QUIT}              = "255";                                # max quit message size
+$config{MAX_TOPIC}             = "307";                                # max topic size
+$config{MAX_KICK}              = "255";                                # max kick message size
+$config{MAX_GECOS}             = "128";                                # max GECOS size
+$config{MAX_AWAY}              = "200";                                # max AWAY size
+$config{MAXBUF}                        = "512";                                # Max buffer size
 if (defined $opt_ident)
 {
        $config{MAX_IDENT} = $opt_ident;
@@ -256,7 +272,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 "") {
@@ -308,6 +324,7 @@ sub update
                                getosflags();
                        }
                        $has_epoll = $config{HAS_EPOLL};
+                       $has_ports = $config{HAS_PORTS};
                        $has_kqueue = $config{HAS_KQUEUE};
                        writefiles(1);
                        makecache();
@@ -338,6 +355,7 @@ sub modupdate
                        print "Updating Files..\n";
                        getosflags();
                        $has_epoll = $config{HAS_EPOLL};
+                       $has_ports = $config{HAS_PORTS};
                        $has_kqueue = $config{HAS_KQUEUE};
                        writefiles(0);
                        makecache();
@@ -362,9 +380,13 @@ sub svnupdate
                print "This is not an SVN copy of InspIRCd.\n";
                exit;
        }
+       else
+       {
+               close(FH);
+       }
        system("svn update");
        system("perl configure -update");
-       if ($ARGV[1] eq "rebuild") {
+       if (defined $opt_rebuild) {
                system("make install");
        }
        exit;
@@ -453,6 +475,22 @@ if ($has_epoll) {
 print "yes\n" if $has_epoll == 1;
 print "no\n" if $has_epoll == 0;
 
+printf "Checking if Solaris I/O completion ports are available... ";
+$has_ports = 0;
+my $system = `uname -s`;
+chomp ($system);
+$has_ports = 1 if ($system eq "SunOS");
+
+if ($has_ports) {
+       my $kernel = `uname -r`;
+       chomp($kernel);
+       if (($kernel !~ /^5\.10/)) {
+               $has_ports = 0;
+       }
+}
+print "yes\n" if $has_ports == 1;
+print "no\n" if $has_ports == 0;
+
 if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
        $config{HAS_STRLCPY} = "true";
 }
@@ -563,7 +601,11 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                yesno(USE_EPOLL,"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
                print "\n";
        }
-       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y"));
+       if ($has_ports) {
+               yesno(USE_PORTS,"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
+               print "\n";
+       }
+       $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
        if (!$chose_hiperf) {
                print "No high-performance socket engines are available, or you chose\n";
                print "not to enable one. Defaulting to select() engine.\n\n";
@@ -573,18 +615,20 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        print "\n";
 
        if ($config{IPV6} eq "y") {
-               print "You have chosen to build an \033[1;32mIPV6-only\033[0m server.\nTo accept IPV4 users, you must use the '::ffff:' notation of addresses.\n\n";
+               print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
                $config{SUPPORT_IP6LINKS} = "y";
        } else {
-               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers which are using '::ffff:' notation?\nIf you are using a recent operating\nsystem and are unsure, answer yes.");
+               yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
                print "\n";
        }
 
        if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
-               print "I have detected both GnuTLS and OpenSSL on your system.\n";
+               print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
                print "I will default to GnuTLS. If you wish to use OpenSSL\n";
                print "instead, you should enable the OpenSSL module yourself\n";
                print "by copying it from src/modules/extra to src/modules.\n\n";
+               print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
+               print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
        }
 
        if ($config{HAS_GNUTLS} eq "y") {
@@ -598,6 +642,9 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
                        print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
                }
        }
+       else {
+               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+       }
 
        print "\nThe following questions will ask you for various figures relating\n";
        print "To your IRCd install. Please note that these should usually be left\n";
@@ -614,8 +661,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");
@@ -646,7 +691,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_gnutls.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -663,11 +707,10 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the Private Key may take some time, go grab a  *
 * Coffee. Even better, to generate some more entropy if it  *
 * is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the   *
+* few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-                       system("certtool --generate-privkey --outfile key.pem");
-                       system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
+                       make_gnutls_cert();
                        print "\nCertificate generation complete, copying to config directory... ";
                        system("mv key.pem $config{CONFIG_DIR}/key.pem");
                        system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
@@ -688,7 +731,6 @@ if ($config{USE_GNUTLS} eq "y") {
                print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
                chdir("src/modules");
                system("ln -s extra/m_ssl_openssl.cpp");
-               system("ln -s extra/ssl_cert.h");
                chdir("../..");
        }
        getmodules();
@@ -703,10 +745,9 @@ if ($config{USE_GNUTLS} eq "y") {
                        print "SSL Certificates Not found, Generating.. \n\n
 *************************************************************
 * Generating the certificates may take some time, go grab a *
-* coffee, or something.                                     *
+* coffee, or something.                                     *
 *************************************************************\n\n";
-                       system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
-                       system("openssl dhparam -out dhparams.pem 1024");
+                       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");
@@ -763,7 +804,7 @@ sub getcache {
                # Ignore Blank lines, and comments..
                next if /^\s*$/;
                next if /^\s*#/;
-               my ($key, $value) = split("=", $_);
+               my ($key, $value) = split("=", $_, 2);
                $value =~ /^\"(.*)\"$/;
                # Do something with data here!
                $config{$key} = $1;
@@ -839,8 +880,16 @@ sub getosflags {
 
        $config{LDLIBS} = "-lstdc++";
        $config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+       $config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -g";
+       $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
        $config{MAKEPROG} = "make";
 
+       if ($config{OSNAME} =~ /darwin/i) {
+               $config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+               $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
+               $config{LDLIBS} = "-ldl -lstdc++";
+       }
+
        if ($config{OSNAME} =~ /OpenBSD/i) {
                $config{MAKEPROG} = "gmake";
                chomp($foo = `eg++ -dumpversion | cut -c 1`);
@@ -903,9 +952,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)
        {
@@ -918,6 +965,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"
@@ -928,8 +979,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}
@@ -940,8 +989,9 @@ 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";
                }
@@ -984,6 +1034,11 @@ EOF
                        $se = "socketengine_epoll";
                        $use_hiperf = 1;
                }
+               if (($has_ports) && ($config{USE_PORTS} eq "y")) {
+                       print FILEHANDLE "#define USE_PORTS\n";
+                       $se = "socketengine_ports";
+                       $use_hiperf = 1;
+               }
                # user didn't choose either epoll or select for their OS.
                # default them to USE_SELECT (ewwy puke puke)
                if (!$use_hiperf) {
@@ -1055,6 +1110,11 @@ 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'
 
@@ -1072,12 +1132,14 @@ EOF
                        $tmp =~ s/\@CC\@/$config{CC}/;
                        $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
                        $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
+                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
                        $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
                        $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
                        $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
                        $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
                        $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
                        $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
+                       $tmp =~ s/\@LIBRARY_EXT\@/$LIBEXT/;
                        $tmp =~ s/\@MODULES\@/$modules/;
                        $tmp =~ s/\@EXECUTABLE\@/$exe/;
                        $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
@@ -1254,9 +1316,19 @@ 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
+EOCHEESE
+
+if ($config{OSNAME} =~ /darwin/) {
+               print FILEHANDLE <<EOCHEESE;
+       \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle $liflags -o m_$i.so m_$i.o $extra
+
+EOCHEESE
+} else {
+               print FILEHANDLE <<EOCHEESE;
        \$(CC) -pipe \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
 
 EOCHEESE
+}
                $crud = $crud . "       install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
 ###
                # End Write Entry to the MakeFile
@@ -1288,7 +1360,11 @@ EOCHEESE
                                        }
                                }
                                print "(\033[1;32m$i files found\033[0m)\n";
-                               print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
+                               if ($config{IS_DARWIN} eq "YES") {
+                                       print FILEHANDLE "\n    \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle -o $name.so $crap3\n"; 
+                               } else {
+                                       print FILEHANDLE "\n    \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
+                               }
                                print FILEHANDLE "\n$crapola\n";
                                closedir(MDIRHANDLE);
                                $crud = $crud . "       install -m \$(INSTMODE) $name.so \$(MODPATH)\n";
@@ -1341,6 +1417,9 @@ if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
 elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
        $se = "socketengine_epoll";
 }
+elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+       $se = "socketengine_ports";
+}
 
        ###
        # This next section is for cygwin dynamic module builds.
@@ -1475,6 +1554,9 @@ sub write_dynamic_makefile {
        elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
                $se = "socketengine_epoll";
        }
+       elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+               $se = "socketengine_ports";
+       }
 
        open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;
@@ -1491,6 +1573,111 @@ 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
+
+if ($config{IS_DARWIN} eq "YES") {
+       print FH <<EOM;
+all: libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib libIRCDsnomasks.dylib inspircd
+
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h $cmdobjs libIRCDtimer.dylib libIRCDcull_list.dylib libIRCDuserprocess.dylib libIRCDsocketengine.dylib libIRCDsocket.dylib libIRCDhash.dylib libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDsnomasks.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDcommand_parse.dylib
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp
+       \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o libIRCDchannels.dylib libIRCDmode.dylib libIRCDxline.dylib libIRCDstring.dylib libIRCDasyncdns.dylib libIRCDbase.dylib libIRCDconfigreader.dylib libIRCDinspsocket.dylib libIRCDcommands.dylib libIRCDdynamic.dylib libIRCDusers.dylib libIRCDmodules.dylib libIRCDwildcard.dylib libIRCDhelper.dylib libIRCDhash.dylib libIRCDsocket.dylib libIRCDsocketengine.dylib libIRCDuserprocess.dylib libIRCDcull_list.dylib libIRCDcommand_parse.dylib libIRCDtimer.dylib libIRCDsnomasks.dylib
+
+libIRCDsocketengine.dylib: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $se.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocketengine.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocketengine.dylib socketengine.o $se.o
+
+libIRCDsnomasks.dylib: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsnomasks.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsnomasks.dylib snomasks.o
+
+libIRCDcommand_parse.dylib: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcommand_parse.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommand_parse.dylib command_parse.o
+
+libIRCDcull_list.dylib: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcull_list.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcull_list.dylib cull_list.o
+
+libIRCDuserprocess.dylib: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDuserprocess.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDuserprocess.dylib userprocess.o
+
+libIRCDhash.dylib: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhash.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhash.dylib hashcomp.o
+
+libIRCDhelper.dylib: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDhelper.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDhelper.dylib helperfuncs.o
+
+libIRCDchannels.dylib: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDchannels.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDchannels.dylib channels.o
+
+libIRCDmode.dylib: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
+       \${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDmode.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmode.dylib mode.o modes/modeclasses.a
+
+libIRCDxline.dylib: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDxline.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDxline.dylib xline.o
+
+libIRCDstring.dylib: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDstring.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDstring.dylib inspstring.o
+
+libIRCDasyncdns.dylib: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDasyncdns.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDasyncdns.dylib dns.o
+
+libIRCDbase.dylib: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDbase.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDbase.dylib base.o
+
+libIRCDconfigreader.dylib: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDconfigreader.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDconfigreader.dylib configreader.o
+
+libIRCDcommands.dylib: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDcommands.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDcommands.dylib commands.o
+
+libIRCDdynamic.dylib: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDdynamic.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDdynamic.dylib dynamic.o
+
+libIRCDusers.dylib: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDusers.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDusers.dylib users.o
+
+libIRCDmodules.dylib: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDmodules.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDmodules.dylib modules.o
+
+libIRCDwildcard.dylib: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c wildcard.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDwildcard.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDwildcard.dylib wildcard.o
+
+libIRCDsocket.dylib: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDsocket.dylib socket.o
+
+libIRCDinspsocket.dylib: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDinspsocket.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDinspsocket.dylib inspsocket.o
+
+libIRCDtimer.dylib: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+       \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
+       \$(CC) -pipe -install_name $config{LIBRARY_DIR}/libIRCDtimer.dylib -dynamiclib -twolevel_namespace -undefined dynamic_lookup -o libIRCDtimer.dylib timer.o
+
+EOM
+
+} else {
+
+       print FH <<EOM;
 all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
 
 inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
@@ -1586,11 +1773,12 @@ libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/gl
        \$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
 
 EOM
+}
        foreach my $cmd (@cmdlist) {
                print FH <<ITEM;
 cmd_$cmd.so: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
        \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-       \$(CC) -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
        }