X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=6b736e92e114b15b151737441ab1c3d0004aaa0b;hb=3102dedbb8a4bf4b0263715d507e3603cf048711;hp=fc7ec497998d80962ead303fe13b5c696d90e5aa;hpb=f791758ec88f30bbc789eda58e97e7c4b83a73f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index fc7ec4979..6b736e92e 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,7 @@ use make::configure;
 
 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,
@@ -95,21 +96,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)
 {
@@ -134,51 +135,51 @@ if (defined $opt_use_gnutls)
 {
 	$config{USE_GNUTLS} = "y";						# Use gnutls.
 }
-$config{USE_OPENSSL}        = "n";						# Use openssl.
+$config{USE_OPENSSL}	= "n";						# Use openssl.
 if (defined $opt_use_openssl)
 {
 	$config{USE_OPENSSL} = "y";
 }
 
 # no, let's not change these.
-$config{OPTIMITEMP}         = "0";                              		# Default Optimisation Value
+$config{OPTIMITEMP}	 = "0";			      		# Default Optimisation Value
 if (!defined $opt_disable_debug)
 {
-	$config{OPTIMISATI}         = "-g";                             	# Optimisation Flag
+	$config{OPTIMISATI}	 = "-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
+$config{MAX_CHANNE}	 = "20";			     		# Default Max. Channels per user
 if (defined $opt_maxchans)
 {
 	$config{MAX_CHANNE} = $opt_maxchans;
 }
-$config{MAX_OPERCH}         = "60"; 						# Default Max. Channels per oper
+$config{MAX_OPERCH}	 = "60"; 						# Default Max. Channels per oper
 if (defined $opt_opermaxchans)
 {
 	$config{MAX_OPERCH} = $opt_opermaxchans;
 }
-$config{MAXI_MODES}         = "20";                             		# Default Max. Number of Modes set at once.
+$config{MAXI_MODES}	 = "20";			     		# Default Max. Number of Modes set at once.
 if (defined $opt_modes)
 {
 	$config{MAXI_MODES} = $opt_modes;
 }
-$config{HAS_STRLCPY}        = "false";                          		# strlcpy Check.
-$config{HAS_STDINT}         = "false";						# stdint.h check
-$config{USE_KQUEUE}         = "y";						# kqueue enabled
+$config{HAS_STRLCPY}	= "false";			  		# strlcpy Check.
+$config{HAS_STDINT}	 = "false";						# stdint.h check
+$config{USE_KQUEUE}	 = "y";						# kqueue enabled
 if (defined $opt_kqueue)
 {
 	$config{USE_KQUEUE} = "y";
@@ -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,7 +197,7 @@ if (defined $opt_noepoll)
 {
 	$config{USE_EPOLL} = "n";
 }
-$config{IPV6}               = "n";						# IPv6 support (experimental)
+$config{IPV6}	       = "n";						# IPv6 support (experimental)
 if (defined $opt_ipv6)
 {
 	$config{IPV6} = "y";
@@ -211,11 +212,16 @@ if (defined $opt_noipv6links)
 	$config{SUPPORT_IP6LINKS} = "n";
 }
 $config{STATIC_LINK}	    = "no";						# are doing static modules?
-chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);           		# FD Limit
+chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);	   		# FD Limit
 chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);			# Hard FD Limit
 chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   		# Major GCC Version
 $config{_SOMAXCONN} = SOMAXCONN;						# Max connections in accept queue
-$config{OSNAME}       	    = $^O;                              		# Operating System Name
+$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)
 {
@@ -224,13 +230,13 @@ if (defined $opt_cc)
 $exec = $config{CC} . " -dumpversion | cut -c 1";
 chomp($config{GCCVER}       = `$exec`);						# Major GCC Version
 $config{MAKEORDER}	    = "ircd mods";					# build order
-$config{STATICLIBS}         = "";						# library archive path
-$config{MAX_IDENT}          = "12";						# max ident size
-$config{MAX_QUIT}           = "255";						# max quit message size
-$config{MAX_TOPIC}          = "307";						# max topic size
-$config{MAX_KICK}           = "255";						# max kick message size
-$config{MAX_GECOS}          = "128";						# max GECOS size
-$config{MAX_AWAY}           = "200";						# max AWAY size
+$config{STATICLIBS}	 = "";						# library archive path
+$config{MAX_IDENT}	  = "12";						# max ident size
+$config{MAX_QUIT}	   = "255";						# max quit message size
+$config{MAX_TOPIC}	  = "307";						# max topic size
+$config{MAX_KICK}	   = "255";						# max kick message size
+$config{MAX_GECOS}	  = "128";						# max GECOS size
+$config{MAX_AWAY}	   = "200";						# max AWAY size
 if (defined $opt_ident)
 {
 	$config{MAX_IDENT} = $opt_ident;
@@ -274,8 +280,8 @@ if ($config{OSNAME} =~ /CYGWIN/i)
 }
 
 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 +294,68 @@ 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_kqueue = $config{HAS_KQUEUE};
+			writefiles(1);
+			makecache();
+			print "Complete.\n";
+			exit;
 		}
-		$has_epoll = $config{HAS_EPOLL};
-		$has_kqueue = $config{HAS_KQUEUE};
-		writefiles(1);
-		print "Complete.\n";
-		exit;
+	};
+	if ($@)
+	{
+		print "Configure update failed: $@\n";
 	}
+	exit;
 }
 
 sub modupdate
 {
-	chomp($topdir = getcwd());
-	$this = resolve_directory($topdir);                                             # PWD, Regardless.
-	getmodules();
-        # Does the cache file exist?
-        if (!getcache()) {
-                # No, No it doesn't.. *BASH*
-                print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-                exit 0;
-        } else {
-                # We've Loaded the cache file and all our variables..
-                print "Updating Files..\n";
-                getosflags();
-                $has_epoll = $config{HAS_EPOLL};
-                $has_kqueue = $config{HAS_KQUEUE};
-                writefiles(0);
-                print "Complete.\n";
-                exit;
-        }
+	eval {
+		chomp($topdir = getcwd());
+		$this = resolve_directory($topdir);					     # PWD, Regardless.
+		getmodules();
+		# Does the cache file exist?
+		if (!getcache()) {
+			# No, No it doesn't.. *BASH*
+			print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+			exit 0;
+		} else {
+			# We've Loaded the cache file and all our variables..
+			print "Updating Files..\n";
+			getosflags();
+			$has_epoll = $config{HAS_EPOLL};
+			$has_kqueue = $config{HAS_KQUEUE};
+			writefiles(0);
+			makecache();
+			print "Complete.\n";
+			exit;
+		}
+	};
+	if ($@)
+	{
+		print "Module update failed: $@\n";
+	}
+	exit;
 }
 
 
@@ -346,9 +368,13 @@ sub svnupdate
 		print "This is not an SVN copy of InspIRCd.\n";
 		exit;
 	}
+	else
+	{
+		close(FH);
+	}
 	system("svn update");
 	system("perl configure -update");
-	if ($ARGV[1] eq "rebuild") {
+	if (defined $opt_rebuild) {
 		system("make install");
 	}
 	exit;
@@ -407,8 +433,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,7 +456,7 @@ if (!$fail) {
 if ($has_epoll) {
 	my $kernel = `uname -r`;
 	chomp($kernel);
-	if (($kernel =~ /2\.0/) || ($kernel =~ /2\.2/) || ($kernel =~ /2\.4/)) {
+	if (($kernel =~ /^2\.0\./) || ($kernel =~ /^2\.2\./) || ($kernel =~ /^2\.4\./)) {
 		$has_epoll = 0;
 	}
 }
@@ -463,7 +489,7 @@ if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPE
 }
 
 ################################################################################
-#                          BEGIN INTERACTIVE PART                              #
+#			  BEGIN INTERACTIVE PART			      #
 ################################################################################
 
 # Clear the Screen..
@@ -528,10 +554,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");
@@ -647,7 +673,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * Generating the Private Key may take some time, go grab a  *
 * Coffee. Even better, to generate some more entropy if it  *
 * is taking a while, open another console and type du / a   *
-* few times and get that HD going :) Then answer the        *
+* few times and get that HD going :) Then answer the	*
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
 			system("certtool --generate-privkey --outfile key.pem");
@@ -687,7 +713,7 @@ if ($config{USE_GNUTLS} eq "y") {
 			print "SSL Certificates Not found, Generating.. \n\n
 *************************************************************
 * Generating the certificates may take some time, go grab a *
-* coffee, or something.                                     *
+* coffee, or something.				     *
 *************************************************************\n\n";
 			system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
 			system("openssl dhparam -out dhparams.pem 1024");
@@ -710,8 +736,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,7 +763,7 @@ FOO2
 }
 
 ################################################################################
-#                              HELPER FUNCTIONS                                #
+#			      HELPER FUNCTIONS				#
 ################################################################################
 sub getcache {
 	# Retrieves the .config.cache file, and loads values into the main config hash.
@@ -747,7 +773,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;
@@ -823,8 +849,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`);
@@ -888,7 +922,7 @@ sub writefiles {
 	# First File.. inspircd_config.h
 	chomp(my $incos = `uname -n -s -r`);
 	chomp(my $version = `sh ./src/version.sh`);
-        chomp(my $revision = getrevision());
+	chomp(my $revision = getrevision());
 	$version = "$version(r$revision)";
 	chomp(my $revision2 = getrevision());
 	if ($writeheader == 1)
@@ -1039,6 +1073,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'
 
@@ -1056,12 +1095,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}/;
@@ -1238,9 +1279,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
@@ -1251,28 +1302,33 @@ EOCHEESE
 	foreach $name (sort readdir(DIRHANDLE)) {
 		if ($name =~ /^m_(.+?)$/) {
 			$crapola = "";
-			$crap2 = "ar r $name.a ";
 			$crap3 = "";
 			# A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
 			if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
-				print FILEHANDLE "$name.a: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps"; 
+				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");
-						print FILEHANDLE " $name/$fname";
-						$crapola = $crapola . "	\$(CC) -pipe -I../../../include \$(FLAGS) $cmflags -export-dynamic -c $name/$fname\n";
 						$oname = $fname;
 						$oname =~ s/\.cpp$/.o/g;
-						$crap2 = $crap2 . " $name/$oname";
-						$crap3 = $crap3 . " $name/$fname";
+						print FILEHANDLE " $name/$oname";
+						$crapola = $crapola .  "$name/$oname: $name/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
+						$crapola = $crapola .  "	\$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $name/$oname -c $name/$fname\n\n";
+						$crap3 = $crap3 . " $name/$oname";
+						$i++;
 					}
 				}
+				print "(\033[1;32m$i files found\033[0m)\n";
+				if ($config{IS_DARWIN} eq "YES") {
+					print FILEHANDLE "\n	\$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle -o $name.so $crap3\n"; 
+				} else {
+					print FILEHANDLE "\n	\$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n";
+				}
 				print FILEHANDLE "\n$crapola\n";
-				print FILEHANDLE "$name.so: $name.a ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h$crap3\n	$crap2\n";
-				print FILEHANDLE "	ranlib $name.a$crap3\n";
-				print FILEHANDLE "	\$(CC) -pipe $liflags -shared -o $name.so $name.a\n";
 				closedir(MDIRHANDLE);
 				$crud = $crud . "	install -m \$(INSTMODE) $name.so \$(MODPATH)\n";
 			}
@@ -1286,20 +1342,20 @@ EOCHEESE
 
 sub write_static_makefile {
 	open(FH,">src/Makefile") or die("Could not write src/Makefile!");
-        my $i = 0;
-        my @cmdlist = ();
-        opendir(DIRHANDLE, "src");
-        foreach $name (sort readdir(DIRHANDLE)) {
-                if ($name =~ /^cmd_(.+)\.cpp$/) {
-                        $cmdlist[$i++] = $1;
-                }
-        }
-        closedir(DIRHANDLE);
-        my $cmdobjs = "";
+	my $i = 0;
+	my @cmdlist = ();
+	opendir(DIRHANDLE, "src");
+	foreach $name (sort readdir(DIRHANDLE)) {
+		if ($name =~ /^cmd_(.+)\.cpp$/) {
+			$cmdlist[$i++] = $1;
+		}
+	}
+	closedir(DIRHANDLE);
+	my $cmdobjs = "";
 	my $srcobjs = "";
-        foreach my $cmd (@cmdlist) {
-                $cmdobjs = $cmdobjs . "cmd_$cmd.o ";
-                $srcobjs = $srcobjs . "cmd_$cmd.cpp ";
+	foreach my $cmd (@cmdlist) {
+		$cmdobjs = $cmdobjs . "cmd_$cmd.o ";
+		$srcobjs = $srcobjs . "cmd_$cmd.cpp ";
 	}
 	print FH <<EOM;
 # Insp Makefile :p
@@ -1439,7 +1495,7 @@ sub write_dynamic_makefile {
 	opendir(DIRHANDLE, "src");
 	foreach $name (sort readdir(DIRHANDLE)) {
 		if ($name =~ /^cmd_(.+)\.cpp$/) {
-	                $cmdlist[$i++] = $1;
+			$cmdlist[$i++] = $1;
 	    	}
 	}
 	closedir(DIRHANDLE);
@@ -1474,6 +1530,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 -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
@@ -1569,11 +1730,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
 	}