X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=43586040511b1050c500631fe2644ebbb94e5b68;hb=66cea632d47aa1ef55a299b3ad5b4db47f556be7;hp=5a3015fb3bd95425ce56c1a13ecc0f8b96fe3037;hpb=a1ecef8e7ceeb547389f2554ca6d537079f6894b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 5a3015fb3..435860405 100755
--- a/configure
+++ b/configure
@@ -430,7 +430,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;
 	}
 }
@@ -1007,6 +1007,17 @@ EOF
 	}
 	chomp($modules);   # Remove Redundant whitespace..
 
+	opendir(DIRHANDLE, "src/modules");
+	foreach $name (sort readdir(DIRHANDLE)) {
+		if ($name =~ /^m_(.+?)$/) {
+			if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
+				closedir(MDIRHANDLE);
+				$modules .= "$name.so ";
+			}
+		}
+	}
+	closedir(DIRHANDLE);
+
 
 	# Write all .in files.
 	my $tmp = "";
@@ -1240,29 +1251,31 @@ 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";
+				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";
 			}
 		}
 	}