Fixed makefile

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

diff --git a/configure b/configure
index aa004f4f2df238f3d511bbb6e35eb939d0bb9611..5d47bdc7e00f0d1993f76c7d6e3e97beafc0c5c6 100755 (executable)
--- a/configure
+++ b/configure
@@ -909,7 +909,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
@@ -917,6 +919,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 {
@@ -1015,6 +1023,9 @@ EOF
                        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";
                }
@@ -1456,8 +1467,8 @@ helperfuncs.o: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../inc
 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 \$(RELCPPFILES)
-       \${MAKE} -C "modes" DIRNAME="src/modes" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+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