X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=ba44b745cf9ae616e0f7e3bce3dbddfe57166898;hb=5b80dc83fdb6b7952e452a8eb2355005fdb5366c;hp=aa39c46280372b086c879e6455f892ce6fffff28;hpb=89a2c994054e1176dafb8b386679f4ae6c3fb62e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index aa39c4628..ba44b745c 100755
--- a/configure
+++ b/configure
@@ -1007,13 +1007,13 @@ sub dir_check {
 sub getosflags {
 
 	$config{LDLIBS} = "-lstdc++";
-	$config{FLAGS}  = "-W -pedantic -fPIC $config{OPTIMISATI}";
-	$config{DEVELOPER} = "-W -pedantic -fPIC -g";
+	$config{FLAGS}  = "-fPIC -Wall -Wextra -pedantic $config{OPTIMISATI}";
+	$config{DEVELOPER} = "-fPIC -Wall -Wextra -pedantic -g";
 	$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
 	$config{MAKEPROG} = "make";
 
 	if ($config{OSNAME} =~ /darwin/i) {
-		$config{FLAGS}  = "-W -pedantic -DDARWIN -frtti -fPIC $config{OPTIMISATI}";
+		$config{FLAGS}  = "-DDARWIN -frtti -fPIC -Wall -Wextra -pedantic $config{OPTIMISATI}";
 		$SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
 		$config{LDLIBS} = "-ldl -lstdc++";
 	}
@@ -1034,7 +1034,7 @@ sub getosflags {
 
 	if ($config{OSNAME} =~ /Linux/i) {
 		$config{LDLIBS} = "-ldl -lstdc++";
-		$config{FLAGS}  = "-W -pedantic -fPIC $config{OPTIMISATI}";
+		$config{FLAGS}  = "-fPIC -Wall -Wextra -pedantic $config{OPTIMISATI}";
 		$config{FLAGS}  .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
 		$config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
 		$config{MAKEPROG} = "make";
@@ -1166,7 +1166,7 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
 #ifndef __CONFIGURATION_SOCKETENGINE__
 #define __CONFIGURATION_SOCKETENGINE__
 
-#include "$se.h"
+#include "socketengines/$se.h"
 
 #endif
 EOF
@@ -1286,23 +1286,16 @@ all: \$(MODULES)
 
 EOF
 
-$nicerflags = $config{FLAGS};
-$nicerflags =~ s/\-pedantic//g;
-
 if ($config{OSNAME} =~ /darwin/) {
 		print FILEHANDLE <<EOCHEESE;
 
-PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle
-LAMEFLAGS = $nicerflags
-LAMEPICFLAGS = -twolevel_namespace -undefined dynamic_lookup $nicerflags -bundle
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
 
 EOCHEESE
 } else {
 		print FILEHANDLE <<EOCHEESE;
 
-PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
-LAMEFLAGS = $nicerflags
-LAMEPICFLAGS = -fPIC -DPIC -shared $nicerflags
+PICLDFLAGS = -fPIC -DPIC -shared
 
 EOCHEESE
 }
@@ -1324,24 +1317,27 @@ EOCHEESE
 		$cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
 		$liflags = getlinkerflags("src/modules/m_".$i.".cpp");
 		$deps = getdependencies("src/modules/m_".$i.".cpp");
+	
+		#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+	
+
+		$nicerflags = $config{FLAGS};
+		$nicerflags =~ s/-pedantic//g;
 
 		if (nopedantic("src/modules/m_".$i.".cpp"))
 		{
-			$fl = "\$(LAMEFLAGS)";
-			$pfl = "\$(LAMEPICFLAGS)";
+			print FILEHANDLE "
+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 $nicerflags $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+"
 		}
 		else
 		{
-			$fl = "\$(FLAGS)";
-			$pfl = "\$(PICFLAGS)";
-		}
-	
-		#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
-	
-		print FILEHANDLE <<EOCHEESE;
+			print FILEHANDLE "
 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 $fl $cmflags $pfl $liflags -export-dynamic -o m_$i.so m_$i.cpp
-EOCHEESE
+	\$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+";
+		}
 		$crud = $crud . "	install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
 ###
 		# End Write Entry to the MakeFile
@@ -1361,9 +1357,9 @@ EOCHEESE
 				print "Composing Makefile rules for directory \033[1;32m$name\033[0m... (\033[1;32m$mfcount files found\033[0m)\n";
 				print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n"; 
 				if ($config{IS_DARWIN} eq "YES") {
-					print FILEHANDLE "	\$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup $fl $mliflags -bundle -o $name.so $mobjs\n"; 
+					print FILEHANDLE "	\$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n"; 
 				} else {
-					print FILEHANDLE "	\$(CC) -pipe $fl -shared $mliflags -o $name.so $mobjs\n";
+					print FILEHANDLE "	\$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n";
 				}
 				print FILEHANDLE "\n$mfrules\n";
 				closedir(MDIRHANDLE);
@@ -1450,7 +1446,7 @@ sub write_dynamic_makefile
 		if ($name =~ /^cmd_(.+)\.cpp$/)
 		{
 			$cmdlist[$i++] = $1;
-			$install_list = $install_list . "	-install -m \$(INSTMODE) src/commands/cmd_" . $1  . ".so \$(LIBPATH)\n";
+			$install_list = $install_list . "	-install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n";
 	    	}
 	}
 	closedir(DIRHANDLE);