Move some stuff from using userrec cached stuff to using stuff in the connect classes

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 8ffabe303c426a11aa01b8c4a0179e84e6b70799..ba44b745cf9ae616e0f7e3bce3dbddfe57166898 100755 (executable)
--- 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,21 +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
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
 
 EOCHEESE
 } else {
                print FILEHANDLE <<EOCHEESE;
 
-PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
-LAMEFLAGS = $nicerflags
+PICLDFLAGS = -fPIC -DPIC -shared
 
 EOCHEESE
 }
@@ -1322,22 +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)";
+                       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)";
-               }
-       
-               #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 \$(PICLDFLAGS) $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
@@ -1357,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);
@@ -1446,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);