X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=66ffb8db520f3b23e28c6eb231a40c2e1f2bc5f2;hb=33b0f56fdeabca9add41a449bc250ea6ea67bf7d;hp=d5921c8e6078c82f4e9c38d6f8997d4ba83be9ad;hpb=b8a0e4415cad04fa30d891c6855429c376c23d7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index d5921c8e6..66ffb8db5 100755
--- a/configure
+++ b/configure
@@ -12,7 +12,9 @@
 #
 ########################################
 
-chomp($topdir = `pwd`);
+use Cwd;
+
+chomp($topdir = getcwd());
 $this = resolve_directory($topdir);						# PWD, Regardless.
 @modlist = ();                                                  		# Declare for Module List..
 %config = ();                                                   		# Initiate Configuration Hash..
@@ -34,15 +36,17 @@ $config{MAX_CHANNE}         = "20";                             		# Default Max.
 $config{MAX_OPERCH}         = "60"; 						# Default Max. Channels per oper
 $config{MAXI_MODES}         = "20";                             		# Default Max. Number of Modes set at once.
 $config{HAS_STRLCPY}        = "false";                          		# strlcpy Check.
+$config{HAS_STDINT}         = "false";						# stdint.h check
+$config{HAS_EXECINFO}       = "0";						# execinfo.h Check.
 $config{USE_KQUEUE}         = "y";						# kqueue enabled
 $config{USE_EPOLL}          = "y";						# epoll enabled
-$config{THREADED_DNS}       = "n";						# threaded dns (experimental)
+$config{THREADED_DNS}       = "n";						# threaded dns
 $config{IPV6}               = "n";						# IPv6 support (experimental)
+$config{SUPPORT_IP6LINKS}   = "y";						# IPv4 supporting IPv6 links (experimental)
 $config{STATIC_LINK}	    = "no";						# are doing static modules?
 chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`);           		# FD Limit
 chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`);			# Hard FD Limit
 chomp($config{GCCVER}       = `g++ -dumpversion | cut -c 1`);   		# Major GCC Version
-chomp($config{GCC34}        = `g++ -dumpversion | cut -c 3`);   		# Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
 $config{MAKEORDER}	    = "ircd mods";					# build order
@@ -59,19 +63,31 @@ $no_svn = 0;
 $config{HAS_OPENSSL} =~ /OpenSSL (\S+) \d+ \S+ \d{4}/;
 $config{HAS_OPENSSL} = $1;
 
+if ($config{GCCVER} eq "") {
+	print "g++ was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
+	exit;
+}
+
 # Minihack! Convert Cygwin to 'Cyg-Static' so i can
 # Keep my dynamic module experiments here for later
 # concideration!
 
-if ($config{OSNAME} =~ /CYGWIN/) {
+if ($config{OSNAME} =~ /CYGWIN/)
+{
 	$config{OSNAME} = "CYG-STATIC";
 }
-
-if ((!$config{OSNAME}) || ($config{OSNAME} eq "")) {
+elsif($config{OSNAME} =~ /^MINGW32/)
+{
+	$config{OSNAME} = "MINGW32";
+}
+elsif ((!$config{OSNAME}) || ($config{OSNAME} eq ""))
+{
 	chomp($config{OSNAME} = `/usr/bin/uname`);
-	if ((!$config{OSNAME}) || ($config{OSNAME} eq "")){
+	
+	if((!$config{OSNAME}) || ($config{OSNAME} eq ""))
+	{
 		$config{OSNAME} = "Unknown";
-	}
+	}	
 }
 
 if (!$config{MAX_CLIENT_T}) { 
@@ -99,12 +115,32 @@ if ($arg eq "-update") {
 		getosflags();
 		$has_epoll = $config{HAS_EPOLL};
 		$has_kqueue = $config{HAS_KQUEUE};
-		writefiles();
+		writefiles(1);
 		print "Complete.\n";
 		exit;
 	}
 }
 
+if ($arg eq "-modupdate") {
+        # Does the cache file exist?
+        if (!getcache()) {
+                # No, No it doesn't.. *BASH*
+                print "You have not run ./configure before. Please do this before trying to run the update script.\n";
+                exit 0;
+        } else {
+                # We've Loaded the cache file and all our variables..
+                print "Updating Files..\n";
+                getosflags();
+                $has_epoll = $config{HAS_EPOLL};
+                $has_kqueue = $config{HAS_KQUEUE};
+                writefiles(0);
+                print "Complete.\n";
+                exit;
+        }
+}
+
+
+
 if ($arg eq "-svnupdate") {
 	my $fail = 0;
 	open(FH,"<.svn/entries") or $fail = 1;
@@ -120,28 +156,6 @@ if ($arg eq "-svnupdate") {
 	exit;
 }
 
-if ($arg eq "-modupdate") {
-	# Does the cache file exist?
-	if (!getcache()) {
-		# No, No it doesn't.. *BASH*
-		print "You have not run ./configure before. Please do this before trying to run the update script.\n";
-		exit 0;
-	} else {
-		# We've Loaded the cache file and all our variables..
-		print "Updating Files..\n";
-		getosflags();
-		$has_epoll = $config{HAS_EPOLL};
-		$has_kqueue = $config{HAS_KQUEUE};
-		if ($config{STATIC_LINK} eq "yes") {
-			write_static_modules_makefile();
-		} else {
-			write_dynamic_modules_makefile();
-		}
-		print "Complete.\n";
-		exit;
-	}
-}
-
 print "Checking for cache from previous configure...\n";
 getcache();
 print "Checking operating system version...\n";
@@ -154,6 +168,17 @@ if (!$config{MAX_CLIENT}) {
 	$config{MAX_CLIENT} = $config{MAX_CLIENT_T};
 }
 
+printf "Checking if stdint.h exists... ";
+$config{HAS_STDINT} = "true";
+my $fail = 0;
+open(STDINT, "</usr/include/stdint.h") or $config{HAS_STDINT} = "false";
+if ($config{HAS_STDINT} eq "true") {
+	close(STDINT);
+}
+print "yes\n" if $config{HAS_STDINT} eq "true";
+print "no\n" if $config{HAS_STDINT} eq "false";
+
+
 printf "Checking if strlcpy exists... ";
 # Perform the strlcpy() test..
 $config{HAS_STRLCPY} = "false";
@@ -172,6 +197,28 @@ if (!$fail) {
 print "yes\n" if $config{HAS_STRLCPY} eq "true";
 print "no\n" if $config{HAS_STRLCPY} eq "false";
 
+printf "Checking if execinfo.h exists... ";
+$config{HAS_EXECINFO} = "0";
+my $fail = 0;
+open(EXECINFO, "</usr/include/execinfo.h") or $fail = 1;
+if ($fail) {
+	$fail = 0;
+	open(EXECINFO, "</usr/local/include/execinfo.h") or $fail = 1;
+	if (!$fail) {
+		printf "/usr/local/include/execinfo.h\n";
+		$config{HAS_EXECINFO} = "1";
+		close(EXECINFO);
+	}
+	else {
+		printf "Not found!\n";
+	}
+}
+else {
+	printf "/usr/include/execinfo.h\n";
+	$config{HAS_EXECINFO} = "1";
+	close(EXECINFO);
+}
+
 printf "Checking if kqueue exists... ";
 $has_kqueue = 0;
 $fail = 0;
@@ -265,7 +312,7 @@ if ($rev eq "r0") {
 print ".\n\n";
 
 $config{CHANGE_COMPILER} = "n";
-print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.$config{GCC34}\033[0m)\n";
+print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
 
 while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) {
 	print "\033[1;32mIMPORTANT!\033[0m A GCC 2.x compiler has been detected, and
@@ -280,9 +327,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 		}
 		chomp($foo = `$config{CC} -dumpversion | cut -c 1`);
 		if ($foo ne "") {
-			chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change
-			chomp($config{GCC34}        = `$config{CC} -dumpversion | cut -c 3`); # the compiler path
-			print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.$config{GCC34}\033[0m)\n";
+			chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers
+			print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
 			if ($config{GCCVER} < 3) {
 				print "\033[1;32mGCC 2.x WILL NOT WORK!\033[0m. Let's try that again, shall we?\n";
 			}
@@ -324,11 +370,16 @@ if (!$chose_hiperf) {
 	print "not to enable one. Defaulting to select() engine.\n\n";
 }
 
-yesno(THREADED_DNS,"Would you like to enable the experimental multi-threaded DNS lookup?");
+yesno(IPV6,"Would you like to build InspIRCd with IPv6 support?");
 print "\n";
 
-yesno(IPV6,"Would you like to enable IPv6 support?");
-print "\n";
+if ($config{IPV6} eq "y") {
+	print "You have chosen to build an \033[1;32mIPV6-only\033[0m server.\nTo accept IPV4 users, you must use the '::ffff:' notation of addresses.\n\n";
+	$config{SUPPORT_IP6LINKS} = "y";
+} else {
+	yesno(SUPPORT_IP6LINKS,"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers which are using '::ffff:' notation?\nIf you are using a recent operating\nsystem and are unsure, answer yes.");
+	print "\n";
+}
 
 if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
 	print "I have detected both GnuTLS and OpenSSL on your system.\n";
@@ -618,28 +669,29 @@ if ($var eq "1") {
 }
 
 print "\n\033[1;32mPre-build configuration is complete!\033[0m\n\n";
-print "\033[0mBase install path:\033[1;32m\t\t$config{BASE_DIR}\n";
-print "\033[0mConfig path:\033[1;32m\t\t\t$config{CONFIG_DIR}\n";
-print "\033[0mModule path:\033[1;32m\t\t\t$config{MODULE_DIR}\n";
-print "\033[0mLibrary path:\033[1;32m\t\t\t$config{LIBRARY_DIR}\n";
-print "\033[0mMax connections:\033[1;32m\t\t$config{MAX_CLIENT}\n";
-print "\033[0mMax User Channels:\033[1;32m\t\t$config{MAX_CHANNE}\n";
-print "\033[0mMax Oper Channels:\033[1;32m\t\t$config{MAX_OPERCH}\n";
-print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\n";
-print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\n";
-print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\n";
-print "\033[0mMax ident length:\033[1;32m\t\t$config{MAX_IDENT}\n";
-print "\033[0mMax quit length:\033[1;32m\t\t$config{MAX_QUIT}\n";
-print "\033[0mMax topic length:\033[1;32m\t\t$config{MAX_TOPIC}\n";
-print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\n";
-print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\n";
-print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\n";
-print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.$config{GCC34}\n";
+print "\033[0mBase install path:\033[1;32m\t\t$config{BASE_DIR}\033[0m\n";
+print "\033[0mConfig path:\033[1;32m\t\t\t$config{CONFIG_DIR}\033[0m\n";
+print "\033[0mModule path:\033[1;32m\t\t\t$config{MODULE_DIR}\033[0m\n";
+print "\033[0mLibrary path:\033[1;32m\t\t\t$config{LIBRARY_DIR}\033[0m\n";
+print "\033[0mMax connections:\033[1;32m\t\t$config{MAX_CLIENT}\033[0m\n";
+print "\033[0mMax User Channels:\033[1;32m\t\t$config{MAX_CHANNE}\033[0m\n";
+print "\033[0mMax Oper Channels:\033[1;32m\t\t$config{MAX_OPERCH}\033[0m\n";
+print "\033[0mMax nickname length:\033[1;32m\t\t$config{NICK_LENGT}\033[0m\n";
+print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\033[0m\n";
+print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\033[0m\n";
+print "\033[0mMax ident length:\033[1;32m\t\t$config{MAX_IDENT}\033[0m\n";
+print "\033[0mMax quit length:\033[1;32m\t\t$config{MAX_QUIT}\033[0m\n";
+print "\033[0mMax topic length:\033[1;32m\t\t$config{MAX_TOPIC}\033[0m\n";
+print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\033[0m\n";
+print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\033[0m\n";
+print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\033[0m\n";
+print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.x\033[0m\n";
 print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
 print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n";
 print "\033[0mStatic modules:\033[1;32m\t\t\t$config{STATIC_LINK}\033[0m\n";
 print "\033[0mMultithread DNS:\033[1;32m\t\t$config{THREADED_DNS}\033[0m\n";
 print "\033[0mIPv6 Support:\033[1;32m\t\t\t$config{IPV6}\033[0m\n";
+print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$config{SUPPORT_IP6LINKS}\033[0m\n";
 print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$config{USE_GNUTLS}\033[0m\n";
 print "\033[0mOpenSSL Support:\033[1;32m\t\t$config{USE_OPENSSL}\033[0m\n\n";
 
@@ -651,6 +703,7 @@ 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();
@@ -685,6 +738,7 @@ 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();
@@ -716,7 +770,7 @@ if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
 
 getosflags();
 makecache();
-writefiles();
+writefiles(1);
 
 print "\n\n";
 print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
@@ -785,17 +839,20 @@ sub dir_check {
 			# Convert it to a full path..
 			$var = resolve_directory($ENV{HOME} . "/" . $1);
 		}
-		if (substr($var,0,1) ne "/")
+		elsif ((($config{OSNAME} == "MINGW32") and ($var !~ /^[A-Z]{1}:\\.*/)) and (substr($var,0,1) ne "/"))
 		{
 			# Assume relative Path was given.. fill in the rest.
 			$var = $this . "/$var";
 		}
+		
 		$var = resolve_directory($var); 
 		if (! -e $var) {
 			print "$var does not exist. Create it?\n[\033[1;32my\033[0m] ";
 			chomp($tmp = <STDIN>);
 			if (($tmp eq "") || ($tmp =~ /^y/i)) {
 				# Attempt to Create the Dir..
+				
+				system("mkdir -p \"$var\" >> /dev/null 2>&1");
 				$chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
 				if ($chk != 0) {
 					print "Unable to create directory. ($var)\n\n";
@@ -824,7 +881,7 @@ sub dir_check {
 sub getosflags {
 	if ($config{OSNAME} =~ /BSD$/) {
 		$config{LDLIBS} = "-Ldl -lstdc++";
-		$config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+		$config{FLAGS}  = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 		$config{MAKEPROG} = "gmake";
 		if ($config{OSNAME} eq "OpenBSD") {
 			chomp($foo = `eg++ -dumpversion | cut -c 1`);
@@ -833,21 +890,20 @@ sub getosflags {
 			# compile as this standard version is 2.95.3!
 			if ($foo ne "") {
 				$config{CC} = "eg++";
-				chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change
-				chomp($config{GCC34}        = `eg++ -dumpversion | cut -c 3`); # the compiler path
+				chomp($config{GCCVER}       = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path
 			}
 		}
 	} else {
 		$config{LDLIBS} = "-ldl -lstdc++";
-		$config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+		$config{FLAGS}  = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 		$config{MAKEPROG} = "make";
 		if ($config{OSNAME} =~ /CYGWIN/) {
-			$config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+			$config{FLAGS}  = "-Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
 			$config{MAKEORDER} = "ircd mods";
 		} elsif ($config{OSNAME} eq "CYG-STATIC") {
-			$config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+			$config{FLAGS} = "-Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
 			$config{MAKEORDER} = "mods ircd";
@@ -855,7 +911,9 @@ sub getosflags {
 			$config{STATIC_LINK} = "yes";
 		}
 	}
-	if ($config{OSNAME} =~ /SunOS/) {
+	
+	if ($config{OSNAME} =~ /SunOS/)
+	{
 		# solaris/sunos needs these
 		# socket = bsd sockets api
 		# nsl = dns stuff
@@ -863,6 +921,12 @@ sub getosflags {
 		# resolv = inet_aton only (why isnt this in nsl?!)
 		$config{LDLIBS} = $config{LDLIBS} . " -lsocket -lnsl -lrt -lresolv";
 	}
+	
+	if($config{OSNAME} eq "MINGW32")
+	{
+		# All code is position-independent on windows
+		$config{FLAGS} =~ s/-fPIC //;
+	}
 }
 
 sub is_dir {
@@ -879,6 +943,7 @@ sub is_dir {
 
 sub getmodules {
 	my $i = 0;
+	print "Detecting modules ";
 	opendir(DIRHANDLE, "src/modules");
 	foreach $name (sort readdir(DIRHANDLE)) {
 		if ($name =~ /^m_(.+)\.cpp$/)
@@ -886,10 +951,12 @@ sub getmodules {
 			$mod = $1;
 			if ($mod !~ /_static$/) {
 				$modlist[$i++] = $mod;
+				print ".";
 			}
 		}
 	}
 	closedir(DIRHANDLE);
+	print "\nOk, $i modules.\n";
 }
 
 sub getrevision {
@@ -897,6 +964,7 @@ sub getrevision {
 		return "0";
 	}
 	my $data = `svn info`;
+	
 	if ($data eq "") {
 		$no_svn = 1;
 		$rev = "0";
@@ -911,17 +979,20 @@ sub getrevision {
 }
 
 sub writefiles {
-	print "Writing \033[1;32minspircd_config.h\033[0m\n";
+	my($writeheader) = @_;
 	# First File.. inspircd_config.h
 	chomp(my $incos = `uname -n -s -r`);
 	chomp(my $version = `sh ./src/version.sh`);
         chomp(my $revision = getrevision());
 	$version = "$version(r$revision)";
 	chomp(my $revision2 = getrevision());
-	open(FILEHANDLE, ">include/inspircd_config.h");
-	my $NL = $config{NICK_LENGT}+1;
-	my $CL = $config{CHAN_LENGT}+1;
-	print FILEHANDLE <<EOF;
+	if ($writeheader == 1)
+	{
+		print "Writing \033[1;32minspircd_config.h\033[0m\n";
+		open(FILEHANDLE, ">include/inspircd_config.h");
+		my $NL = $config{NICK_LENGT}+1;
+		my $CL = $config{CHAN_LENGT}+1;
+		print FILEHANDLE <<EOF;
 /* Auto generated by configure, do not modify! */
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
@@ -944,61 +1015,83 @@ sub writefiles {
 #define MAXGECOS $config{MAX_GECOS}
 #define MAXAWAY $config{MAX_AWAY}
 #define OPTIMISATION $config{OPTIMITEMP}
+#define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
 #define MAXBUF 514
 EOF
-	if ($config{OSNAME} =~ /SunOS/) {
-		print FILEHANDLE "#define IS_SOLARIS\n";
-	}
-	if ($config{OSNAME} =~ /CYGWIN/) {
-		print FILEHANDLE "#define IS_CYGWIN\n";
-		print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE	1024\n#endif\n";
-	}
-	if ($config{OSNAME} eq "CYG-STATIC") {
-		print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
-	}
-
-	if ($config{STATIC_LINK} eq "yes") {
-		print FILEHANDLE "#define STATIC_LINK\n";
-	}
-	if ($config{GCCVER} > 3) {
-		print FILEHANDLE "#define GCC3\n";
-		print FILEHANDLE "#define GCC34\n";
-	}
-	else
-	{
-		if ($config{GCCVER} == 3) {
+		if ($config{OSNAME} =~ /SunOS/) {
+			print FILEHANDLE "#define IS_SOLARIS\n";
+		}
+		if ($config{OSNAME} =~ /CYGWIN/) {
+			print FILEHANDLE "#define IS_CYGWIN\n";
+			print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE	1024\n#endif\n";
+		}
+		if ($config{OSNAME} eq "MINGW32") {
+			print FILEHANDLE "#define IS_MINGW\n";
+		}
+		if ($config{OSNAME} eq "CYG-STATIC") {
+			print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
+		}
+		if ($config{HAS_EXECINFO} eq "1") {
+			print FILEHANDLE "#define HAS_EXECINFO\n";
+		}
+		if ($config{STATIC_LINK} eq "yes") {
+			print FILEHANDLE "#define STATIC_LINK\n";
+		}
+		if ($config{GCCVER} >= 3) {
 			print FILEHANDLE "#define GCC3\n";
-			if ($config{GCC34} > 3) {
-				print FILEHANDLE "#define GCC34\n";
-			}
 		}
+		if ($config{HAS_STRLCPY} eq "true") {
+			print FILEHANDLE "#define HAS_STRLCPY\n";
+		}
+		if ($config{HAS_STDINT} eq "true") {
+			print FILEHANDLE "#define HAS_STDINT\n";
+		}
+		if ($config{THREADED_DNS} =~ /y/i) {
+			print FILEHANDLE "#define THREADED_DNS\n";
+		}
+		if ($config{IPV6} =~ /y/i) {
+			print FILEHANDLE "#define IPV6\n";
+		}
+		if ($config{SUPPORT_IP6LINKS} =~ /y/i) {
+			print FILEHANDLE "#define SUPPORT_IP6LINKS\n";
+		}
+		my $use_hiperf = 0;
+		if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+			print FILEHANDLE "#define USE_KQUEUE\n";
+			$se = "socketengine_kqueue";
+			$use_hiperf = 1;
+		}
+		if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+			print FILEHANDLE "#define USE_EPOLL\n";
+			$se = "socketengine_epoll";
+			$use_hiperf = 1;
+		}
+		# user didn't choose either epoll or select for their OS.
+		# default them to USE_SELECT (ewwy puke puke)
+		if (!$use_hiperf) {
+			print FILEHANDLE "#define USE_SELECT\n";
+			$se = "socketengine_select";
+		}
+		print FILEHANDLE "\n#endif\n";
+		close(FILEHANDLE);
 	}
-	if ($config{HAS_STRLCPY} eq "true") {
-		print FILEHANDLE "#define HAS_STRLCPY\n";
-	}
-	if ($config{THREADED_DNS} =~ /y/i) {
-		print FILEHANDLE "#define THREADED_DNS\n";
-	}
-	if ($config{IPV6} =~/y/i) {
-		print FILEHANDLE "#define IPV6\n";
-	}
-	my $use_hiperf = 0;
-	if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
-		print FILEHANDLE "#define USE_KQUEUE\n";
-		$use_hiperf = 1;
-	}
-	if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
-		print FILEHANDLE "#define USE_EPOLL\n";
-		$use_hiperf = 1;
-	}
-	# user didn't choose either epoll or select for their OS.
-	# default them to USE_SELECT (ewwy puke puke)
-	if (!$use_hiperf) {
-		print FILEHANDLE "#define USE_SELECT\n";
+
+	if ($writeheader)
+	{
+		open(FILEHANDLE, ">include/inspircd_se_config.h");
+		print FILEHANDLE <<EOF;
+/* Auto generated by configure, do not modify or commit to svn! */
+#ifndef __CONFIGURATION_SOCKETENGINE__
+#define __CONFIGURATION_SOCKETENGINE__
+
+#include "$se.h"
+
+#endif
+EOF
+		close(FILEHANDLE);
 	}
-	print FILEHANDLE "\n#endif\n";
-	close(FILEHANDLE);
+
 
 	# Create a Modules List..
 	my $modules = "";
@@ -1199,9 +1292,9 @@ HEADER
 			# Write Entry to the Makefile
 			###
 			print FILEHANDLE <<EOCHEESE;
-m_$i.o: m_$i\_static.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h
-	\$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c m_$i\_static.cpp
-	mv m_$i\_static.o ../m_$i.o
+m_$i.o: .m_$i\_static.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h
+	\$(CC) -pipe -I../../include \$(FLAGS) $flags -export-dynamic -c .m_$i\_static.cpp
+	mv .m_$i\_static.o ../m_$i.o
 
 EOCHEESE
 			###
@@ -1209,7 +1302,7 @@ EOCHEESE
 			###
 			print "Configuring module [\033[1;32mm_$i.so\033[0m] for static linking... ";
 			open(MODULE,"<src/modules/m_".$i.".cpp") or die("Could not open m_".$i.".cpp");
-			open(MUNGED,">src/modules/m_".$i."_static.cpp") or die("Could not create m_".$i."_static.cpp");
+			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";
@@ -1273,8 +1366,8 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch
 	\$(CC) \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
 
 EOCHEESE
-	$crud = $crud . "	\@install -v -m 0700 m_$i.so \$(MODPATH)\n";
-	###
+	$crud = $crud . "	install -m 0700 m_$i.so \$(MODPATH)\n";
+###
 	# End Write Entry to the MakeFile
 	###
 	}
@@ -1310,8 +1403,19 @@ sub write_static_makefile {
 CC = im a cheezeball
 
 CXXFLAGS = -I../include \${FLAGS}
+CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
+RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
 
 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
@@ -1323,20 +1427,20 @@ EOM
 
 	if ($config{OSNAME} =~ /CYGWIN/) {
 		print FH <<EOM;
-all: timer.o aes.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o message.o $cmdobjs commands.o dnsqueue.o dynamic.o users.o modules.o wildcard.o helperfuncs.o inspircd.exe
+all: timer.o aes.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o snomasks.o inspircd.exe
 
 inspircd.exe: inspircd.dll.a
 	\$(CC) -o \$@ \$^
 
-inspircd.dll inspircd.dll.a: inspircd.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o message.o $cmdobjs  commands.o dnsqueue.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o
+inspircd.dll inspircd.dll.a: inspircd.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs  commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o snomasks.o
 	\$(CC) -shared -Wl,--out-implib=inspircd.dll.a -o inspircd.dll \$^
 EOM
 	} else {
 		print FH <<EOM;
-all: timer.o aes.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o message.o $cmdobjs commands.o dnsqueue.o dynamic.o users.o modules.o wildcard.o helperfuncs.o \$(MODULES) inspircd.exe
+all: timer.o aes.o command_parse.o cull_list.o userprocess.o socketengine.o socket.o hashcomp.o channels.o mode.o xline.o inspstring.o dns.o base.o configreader.o inspsocket.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o snomasks.o \$(MODULES) inspircd.exe
 
 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 message.o $cmdobjs commands.o dnsqueue.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o modes/modeclasses.a \$(MODULES)
+	\$(CC) -I../include \$(FLAGS) inspircd.cpp -o inspircd.exe \$(LDLIBS) channels.o mode.o xline.o inspstring.o dns.o base.o inspsocket.o configreader.o $cmdobjs commands.o dynamic.o users.o modules.o wildcard.o helperfuncs.o hashcomp.o socket.o socketengine.o userprocess.o cull_list.o command_parse.o aes.o timer.o snomasks.o modes/modeclasses.a \$(MODULES)
 EOM
 	}
 
@@ -1345,25 +1449,29 @@ EOM
 cull_list.o: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
 
+snomasks.o: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
+	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+
 command_parse.o: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
 
 userprocess.o: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
 
-socketengine.o: socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
+socketengine.o: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
 
 hashcomp.o: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
 
 helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+	\$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
 
 channels.o: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
 
-mode.o: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+mode.o: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES) modes/modeclasses.a
+	\${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS)
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
 
 xline.o: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1381,15 +1489,9 @@ base.o: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_conf
 configreader.o: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
 
-message.o: message.cpp ../include/base.h ../include/message.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c message.cpp
-
 commands.o: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp $cmdobjs
 
-dnsqueue.o: dnsqueue.cpp ../include/base.h ../include/dnsqueue.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dnsqueue.cpp
-
 dynamic.o: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
 
@@ -1417,7 +1519,7 @@ timer.o: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h
 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/cmd_$cmd.h
+cmd_$cmd.o: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
 ITEM
 	}
@@ -1439,10 +1541,24 @@ sub write_dynamic_makefile {
 	my $cmdobjs = "";
 	my $srcobjs = "";
 	foreach my $cmd (@cmdlist) {
-		$cmdobjs = $cmdobjs . "cmd_$cmd.o ";
+		$cmdobjs = $cmdobjs . "cmd_$cmd.so ";
 		$srcobjs = $srcobjs . "cmd_$cmd.cpp ";
 	}
 
+if (($config{OSNAME} !~ /Linux/i) && ($config{HAS_EXECINFO} eq "1")) {
+	$extra = "-L/usr/local/lib -lexecinfo";
+} else {
+	$extra = "";
+}
+
+$se = "socketengine_select";
+if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
+	$se = "socketengine_kqueue";
+}
+elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
+	$se = "socketengine_epoll";
+}
+
 	open(FH,">src/Makefile") or die("Could not write src/Makefile");
 	print FH <<EOM;
 # Insp Makefile :p
@@ -1455,15 +1571,21 @@ sub write_dynamic_makefile {
 CC = im a cheezeball
 
 CXXFLAGS = -I../include \${FLAGS}
+CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
+RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
 
-all: libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDmessage.so $cmdobjs libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so inspircd
+all: libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
 
-inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h
-	\$(CC) -I../include -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDaes.so libIRCDtimer.so
+inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDaes.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
+	\$(CC) -I../include $extra -Wl,--rpath -Wl,/usr/local/lib -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDaes.so libIRCDtimer.so libIRCDsnomasks.so
 
-libIRCDsocketengine.so: socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp
-	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o
+libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
+	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
+
+libIRCDsnomasks.so: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
+	 \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+	  \$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
 
 libIRCDcommand_parse.so: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
@@ -1482,15 +1604,16 @@ libIRCDhash.so: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/
 	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
 
 libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+	\$(CC) -pipe -I/usr/local/include -L/usr/local/lib -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
 	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
 
 libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
 	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
 
-libIRCDmode.so: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+libIRCDmode.so: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
+	\${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
 	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
 
 libIRCDxline.so: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
@@ -1513,17 +1636,9 @@ libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configread
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
 	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
 
-libIRCDmessage.so: message.cpp ../include/base.h ../include/message.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c message.cpp
-	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmessage.so message.o
-
-libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h $srcobjs
+libIRCDcommands.so: commands.cpp ../include/base.h ../include/commands.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
-	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o $cmdobjs
-
-libIRCDdnsqueue.so: dnsqueue.cpp ../include/base.h ../include/dnsqueue.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
-	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dnsqueue.cpp
-	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdnsqueue.so dnsqueue.o
+	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
 
 libIRCDdynamic.so: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
@@ -1560,8 +1675,9 @@ libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/gl
 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/cmd_$cmd.h
+cmd_$cmd.so: cmd_$cmd.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/commands/cmd_$cmd.h
 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
+	\$(CC) -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o cmd_$cmd.so cmd_$cmd.o
 
 ITEM
 	}